Skip to content

Commit 101f69e

Browse files
jemcjemc
committed
Merge pull request #1019 from hintjens/master
Fixes to project packaging
2 parents b01b103 + bfdf17d commit 101f69e

File tree

21 files changed

+96
-192
lines changed

21 files changed

+96
-192
lines changed

‎.gitignore‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ src/*.o
2121
src/mtrace.txt
2222
src/outbin
2323
src/czmq_selftest
24+
doc/*.1
2425
doc/*.3
2526
doc/*.7
2627
doc/*.xml
@@ -94,38 +95,16 @@ examples/zpubsub/zprototest/*.bnf
9495
examples/zpubsub/zprototest/test_publisher
9596
examples/zpubsub/zprototest/test_subscriber
9697
src/test_zgossip
97-
labs/.deps/
98-
labs/.libs/
99-
labs/*.o
100-
labs/*.lo
101-
labs/*.pc
102-
98+
.deps
99+
.libs
103100
.cproject
104101
.project
102+
.dirstamp
105103
*~
106-
labs/*.lo
107-
labs/*.o
108-
labs/.deps/
109-
labs/.libs/
110-
labs/Makefile
111-
labs/Makefile.in
112-
labs/core
113-
labs/czmq_labs.la
114-
labs/czmq_labs_selftest
115-
labs/czmq_labs_selftest.log
116-
labs/czmq_labs_selftest.trs
117-
labs/libczmq_labs.pc
118-
labs/malloc.txt
119-
labs/mtrace.txt
120-
labs/outbin
121-
labs/test-suite.log
122104
ChangeLog
123105
.libs/
124106
czmq_labs_selftest*
125107
czmq_selftest*
126108
makecert
127109
test-suite.log
128-
addons/.dirstamp
129-
labs/.dirstamp
130-
src/.dirstamp
131110
*.pyc

‎CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@ set (czmq_headers
134134
src/zgossip_engine.inc
135135
src/zhash_primes.inc
136136
src/zclass_example.xml
137+
src/foreign/sha1/sha1.inc_c
138+
src/foreign/sha1/sha1.h
139+
src/foreign/slre/slre.inc_c
140+
src/foreign/slre/slre.h
141+
src/foreign/slre/readme.txt
137142
)
138143
source_group ("Header Files" FILES ${czmq_headers})
139144
install(FILES ${czmq_headers} DESTINATION include)

‎Makefile.am‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ project_libs = \
1313
${zmq_LIBS}
1414

1515
SUBDIRS =
16+
DIST_SUBDIRS =
1617
SUBDIRS += doc
18+
DIST_SUBDIRS += doc
1719

18-
DIST_SUBDIRS =
1920
lib_LTLIBRARIES =
2021
bin_PROGRAMS =
2122
noinst_PROGRAMS =
@@ -27,6 +28,13 @@ EXTRA_DIST = \
2728
src/zgossip_engine.inc \
2829
src/zhash_primes.inc \
2930
src/zclass_example.xml \
31+
src/foreign/sha1/sha1.inc_c \
32+
src/foreign/sha1/sha1.h \
33+
src/foreign/slre/slre.inc_c \
34+
src/foreign/slre/slre.h \
35+
src/foreign/slre/readme.txt \
36+
src/zgossip_msg.h \
37+
src/czmq_classes.h \
3038
version.sh
3139

3240
include $(srcdir)/src/Makemodule.am

‎builds/msvc/vs2008/czmq/czmq.vcproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,6 +1560,11 @@
15601560
<File RelativePath="..\..\..\..\src\zgossip_engine.inc" />
15611561
<File RelativePath="..\..\..\..\src\zhash_primes.inc" />
15621562
<File RelativePath="..\..\..\..\src\zclass_example.xml" />
1563+
<File RelativePath="..\..\..\..\src\foreign/sha1/sha1.inc_c" />
1564+
<File RelativePath="..\..\..\..\src\foreign/sha1/sha1.h" />
1565+
<File RelativePath="..\..\..\..\src\foreign/slre/slre.inc_c" />
1566+
<File RelativePath="..\..\..\..\src\foreign/slre/slre.h" />
1567+
<File RelativePath="..\..\..\..\src\foreign/slre/readme.txt" />
15631568
</Filter>
15641569
</Files>
15651570
<Globals />

‎builds/msvc/vs2010/czmq/czmq.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@
8383
<ClInclude Include="..\..\..\..\src\zgossip_engine.inc" />
8484
<ClInclude Include="..\..\..\..\src\zhash_primes.inc" />
8585
<ClInclude Include="..\..\..\..\src\zclass_example.xml" />
86+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c" />
87+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h" />
88+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c" />
89+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.h" />
90+
<ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt" />
8691
</ItemGroup>
8792
<ItemGroup>
8893
<ClCompile Include="..\..\..\..\src\zactor.c">

‎builds/msvc/vs2010/czmq/czmq.vcxproj.filters‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,21 @@
150150
<ClInclude Include="..\..\..\..\src\zclass_example.xml">
151151
<Filter>src</Filter>
152152
</ClInclude>
153+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c">
154+
<Filter>src</Filter>
155+
</ClInclude>
156+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h">
157+
<Filter>src</Filter>
158+
</ClInclude>
159+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c">
160+
<Filter>src</Filter>
161+
</ClInclude>
162+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.h">
163+
<Filter>src</Filter>
164+
</ClInclude>
165+
<ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt">
166+
<Filter>src</Filter>
167+
</ClInclude>
153168
</ItemGroup>
154169
<ItemGroup>
155170
<ClInclude Include="..\..\..\..\builds\msvc\platform.h">

‎builds/msvc/vs2012/czmq/czmq.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@
8383
<ClInclude Include="..\..\..\..\src\zgossip_engine.inc" />
8484
<ClInclude Include="..\..\..\..\src\zhash_primes.inc" />
8585
<ClInclude Include="..\..\..\..\src\zclass_example.xml" />
86+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c" />
87+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h" />
88+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c" />
89+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.h" />
90+
<ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt" />
8691
</ItemGroup>
8792
<ItemGroup>
8893
<ClCompile Include="..\..\..\..\src\zactor.c">

‎builds/msvc/vs2012/czmq/czmq.vcxproj.filters‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,21 @@
150150
<ClInclude Include="..\..\..\..\src\zclass_example.xml">
151151
<Filter>src</Filter>
152152
</ClInclude>
153+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c">
154+
<Filter>src</Filter>
155+
</ClInclude>
156+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h">
157+
<Filter>src</Filter>
158+
</ClInclude>
159+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c">
160+
<Filter>src</Filter>
161+
</ClInclude>
162+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.h">
163+
<Filter>src</Filter>
164+
</ClInclude>
165+
<ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt">
166+
<Filter>src</Filter>
167+
</ClInclude>
153168
</ItemGroup>
154169
<ItemGroup>
155170
<ClInclude Include="..\..\..\..\builds\msvc\platform.h">

‎builds/msvc/vs2013/czmq/czmq.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@
8383
<ClInclude Include="..\..\..\..\src\zgossip_engine.inc" />
8484
<ClInclude Include="..\..\..\..\src\zhash_primes.inc" />
8585
<ClInclude Include="..\..\..\..\src\zclass_example.xml" />
86+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c" />
87+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h" />
88+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c" />
89+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.h" />
90+
<ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt" />
8691
</ItemGroup>
8792
<ItemGroup>
8893
<ClCompile Include="..\..\..\..\src\zactor.c">

‎builds/msvc/vs2013/czmq/czmq.vcxproj.filters‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,21 @@
150150
<ClInclude Include="..\..\..\..\src\zclass_example.xml">
151151
<Filter>src</Filter>
152152
</ClInclude>
153+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c">
154+
<Filter>src</Filter>
155+
</ClInclude>
156+
<ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h">
157+
<Filter>src</Filter>
158+
</ClInclude>
159+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c">
160+
<Filter>src</Filter>
161+
</ClInclude>
162+
<ClInclude Include="..\..\..\..\src\foreign/slre/slre.h">
163+
<Filter>src</Filter>
164+
</ClInclude>
165+
<ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt">
166+
<Filter>src</Filter>
167+
</ClInclude>
153168
</ItemGroup>
154169
<ItemGroup>
155170
<ClInclude Include="..\..\..\..\builds\msvc\platform.h">

0 commit comments

Comments
 (0)