Merge pull request #1019 from hintjens/master

Fixes to project packaging
zeromq · Jun 2, 2015 · 101f69e · 101f69e
2 parents b01b103 + bfdf17d
commit 101f69e
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 192 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ src/*.o
 src/mtrace.txt
 src/outbin
 src/czmq_selftest
+doc/*.1
 doc/*.3
 doc/*.7
 doc/*.xml
@@ -94,38 +95,16 @@ examples/zpubsub/zprototest/*.bnf
 examples/zpubsub/zprototest/test_publisher
 examples/zpubsub/zprototest/test_subscriber
 src/test_zgossip
-labs/.deps/
-labs/.libs/
-labs/*.o
-labs/*.lo
-labs/*.pc
-
+.deps
+.libs
 .cproject
 .project
+.dirstamp
 *~
-labs/*.lo
-labs/*.o
-labs/.deps/
-labs/.libs/
-labs/Makefile
-labs/Makefile.in
-labs/core
-labs/czmq_labs.la
-labs/czmq_labs_selftest
-labs/czmq_labs_selftest.log
-labs/czmq_labs_selftest.trs
-labs/libczmq_labs.pc
-labs/malloc.txt
-labs/mtrace.txt
-labs/outbin
-labs/test-suite.log
 ChangeLog
 .libs/
 czmq_labs_selftest*
 czmq_selftest*
 makecert
 test-suite.log
-addons/.dirstamp
-labs/.dirstamp
-src/.dirstamp
 *.pyc
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -134,6 +134,11 @@ set (czmq_headers
     src/zgossip_engine.inc
     src/zhash_primes.inc
     src/zclass_example.xml
+    src/foreign/sha1/sha1.inc_c
+    src/foreign/sha1/sha1.h
+    src/foreign/slre/slre.inc_c
+    src/foreign/slre/slre.h
+    src/foreign/slre/readme.txt
 )
 source_group ("Header Files" FILES ${czmq_headers})
 install(FILES ${czmq_headers} DESTINATION include)

diff --git a/Makefile.am b/Makefile.am
@@ -13,9 +13,10 @@ project_libs = \
     ${zmq_LIBS}
 
 SUBDIRS =
+DIST_SUBDIRS =
 SUBDIRS += doc
+DIST_SUBDIRS += doc
 
-DIST_SUBDIRS =
 lib_LTLIBRARIES =
 bin_PROGRAMS =
 noinst_PROGRAMS =
@@ -27,6 +28,13 @@ EXTRA_DIST = \
     src/zgossip_engine.inc \
     src/zhash_primes.inc \
     src/zclass_example.xml \
+    src/foreign/sha1/sha1.inc_c \
+    src/foreign/sha1/sha1.h \
+    src/foreign/slre/slre.inc_c \
+    src/foreign/slre/slre.h \
+    src/foreign/slre/readme.txt \
+    src/zgossip_msg.h \
+    src/czmq_classes.h \
     version.sh
 
 include $(srcdir)/src/Makemodule.am

diff --git a/builds/msvc/vs2008/czmq/czmq.vcproj b/builds/msvc/vs2008/czmq/czmq.vcproj
@@ -1560,6 +1560,11 @@
       <File RelativePath="..\..\..\..\src\zgossip_engine.inc" />
       <File RelativePath="..\..\..\..\src\zhash_primes.inc" />
       <File RelativePath="..\..\..\..\src\zclass_example.xml" />
+      <File RelativePath="..\..\..\..\src\foreign/sha1/sha1.inc_c" />
+      <File RelativePath="..\..\..\..\src\foreign/sha1/sha1.h" />
+      <File RelativePath="..\..\..\..\src\foreign/slre/slre.inc_c" />
+      <File RelativePath="..\..\..\..\src\foreign/slre/slre.h" />
+      <File RelativePath="..\..\..\..\src\foreign/slre/readme.txt" />
     </Filter>
   </Files>
   <Globals />

diff --git a/builds/msvc/vs2010/czmq/czmq.vcxproj b/builds/msvc/vs2010/czmq/czmq.vcxproj
@@ -83,6 +83,11 @@
     <ClInclude Include="..\..\..\..\src\zgossip_engine.inc" />
     <ClInclude Include="..\..\..\..\src\zhash_primes.inc" />
     <ClInclude Include="..\..\..\..\src\zclass_example.xml" />
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c" />
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h" />
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c" />
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.h" />
+    <ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\zactor.c">

diff --git a/builds/msvc/vs2010/czmq/czmq.vcxproj.filters b/builds/msvc/vs2010/czmq/czmq.vcxproj.filters
@@ -150,6 +150,21 @@
     <ClInclude Include="..\..\..\..\src\zclass_example.xml">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\builds\msvc\platform.h">

diff --git a/builds/msvc/vs2012/czmq/czmq.vcxproj b/builds/msvc/vs2012/czmq/czmq.vcxproj
@@ -83,6 +83,11 @@
     <ClInclude Include="..\..\..\..\src\zgossip_engine.inc" />
     <ClInclude Include="..\..\..\..\src\zhash_primes.inc" />
     <ClInclude Include="..\..\..\..\src\zclass_example.xml" />
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c" />
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h" />
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c" />
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.h" />
+    <ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\zactor.c">

diff --git a/builds/msvc/vs2012/czmq/czmq.vcxproj.filters b/builds/msvc/vs2012/czmq/czmq.vcxproj.filters
@@ -150,6 +150,21 @@
     <ClInclude Include="..\..\..\..\src\zclass_example.xml">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\builds\msvc\platform.h">

diff --git a/builds/msvc/vs2013/czmq/czmq.vcxproj b/builds/msvc/vs2013/czmq/czmq.vcxproj
@@ -83,6 +83,11 @@
     <ClInclude Include="..\..\..\..\src\zgossip_engine.inc" />
     <ClInclude Include="..\..\..\..\src\zhash_primes.inc" />
     <ClInclude Include="..\..\..\..\src\zclass_example.xml" />
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c" />
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h" />
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c" />
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.h" />
+    <ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\zactor.c">

diff --git a/builds/msvc/vs2013/czmq/czmq.vcxproj.filters b/builds/msvc/vs2013/czmq/czmq.vcxproj.filters
@@ -150,6 +150,21 @@
     <ClInclude Include="..\..\..\..\src\zclass_example.xml">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.inc_c">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/sha1/sha1.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.inc_c">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/slre/slre.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\foreign/slre/readme.txt">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\builds\msvc\platform.h">

diff --git a/project.xml b/project.xml
@@ -48,6 +48,11 @@
     <extra name = "zgossip_engine.inc" />
     <extra name = "zhash_primes.inc" />
     <extra name = "zclass_example.xml" />
+    <extra name = "foreign/sha1/sha1.inc_c" />
+    <extra name = "foreign/sha1/sha1.h" />
+    <extra name = "foreign/slre/slre.inc_c" />
+    <extra name = "foreign/slre/slre.h" />
+    <extra name = "foreign/slre/readme.txt" />
 
     <!-- Deprecated V2 API, remove some time after 3.0 stability -->
     <class name = "zauth_v2" />

diff --git a/src/Makemodule.am b/src/Makemodule.am
@@ -105,6 +105,11 @@ src_libczmq_la_SOURCES = \
     src/zgossip_engine.inc \
     src/zhash_primes.inc \
     src/zclass_example.xml \
+    src/foreign/sha1/sha1.inc_c \
+    src/foreign/sha1/sha1.h \
+    src/foreign/slre/slre.inc_c \
+    src/foreign/slre/slre.h \
+    src/foreign/slre/readme.txt \
     src/platform.h
 
 src_libczmq_la_CPPFLAGS = ${AM_CPPFLAGS}

diff --git a/foreign/sha1/sha1.h → src/foreign/sha1/sha1.h b/foreign/sha1/sha1.h → src/foreign/sha1/sha1.h
diff --git a/foreign/sha1/sha1.c → src/foreign/sha1/sha1.inc_c b/foreign/sha1/sha1.c → src/foreign/sha1/sha1.inc_c
@@ -33,7 +33,7 @@
  * implemented by Jun-ichiro itojun Itoh <[email protected]>
  */
 
-#include "../../include/czmq.h"
+#include "../../../include/czmq.h"
 #include "sha1.h"
 
 /* constant table */

diff --git a/foreign/sha1/sha1.o → src/foreign/sha1/sha1.o b/foreign/sha1/sha1.o → src/foreign/sha1/sha1.o
diff --git a/foreign/slre/readme.txt → src/foreign/slre/readme.txt b/foreign/slre/readme.txt → src/foreign/slre/readme.txt
diff --git a/foreign/slre/slre.h → src/foreign/slre/slre.h b/foreign/slre/slre.h → src/foreign/slre/slre.h
diff --git a/foreign/slre/slre.c → src/foreign/slre/slre.inc_c b/foreign/slre/slre.c → src/foreign/slre/slre.inc_c
diff --git a/src/zdigest.c b/src/zdigest.c
@@ -25,7 +25,7 @@
 
 #include "platform.h"
 #include "../include/czmq.h"
-#include "../foreign/sha1/sha1.c"
+#include "foreign/sha1/sha1.inc_c"
 
 
 //  Structure of our class

diff --git a/src/zrex.c b/src/zrex.c
@@ -44,8 +44,7 @@
 */
 
 #include "../include/czmq.h"
-#include "../foreign/slre/slre.h"
-#include "../foreign/slre/slre.c"
+#include "foreign/slre/slre.inc_c"
 
 #define MAX_HITS 100            //  Should be enough for anyone :)