Fixed packaging for 1.4.0

zeromq · Apr 30, 2013 · d709521 · d709521
1 parent fc75ab3
commit d709521
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,22 @@
 ACLOCAL_AMFLAGS = -I config
 
 SUBDIRS = src doc
+
 DIST_SUBDIRS = src doc
+
+EXTRA_DIST = \
+	builds/android/Android.mk \
+	builds/android/Application.mk \
+	builds/android/build.sh \
+	builds/android/clean.sh \
+	builds/mingw32/Makefile.mingw32 \
+	builds/mingw32/platform.h \
+	builds/msvc/czmq11.sln \
+	builds/msvc/czmq_selftest.vcproj \
+	builds/msvc/czmq_selftest.vcxproj \
+	builds/msvc/czmq_selftest.vcxproj.filters \
+	builds/msvc/czmq.sln \
+	builds/msvc/czmq.vcproj \
+	builds/msvc/czmq.vcxproj \
+	builds/msvc/czmq.vcxproj.filters \
+	builds/msvc/README.txt
diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am
diff --git a/configure.ac b/configure.ac
@@ -226,5 +226,5 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(perror gettimeofday memset getifaddrs freeifaddrs)
 
 # Specify output files
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile builds/msvc/Makefile src/libczmq.pc])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile src/libczmq.pc])
 AC_OUTPUT
diff --git a/doc/zhash.txt b/doc/zhash.txt
@@ -163,6 +163,10 @@ EXAMPLE
     assert (streq (item, "dead beef"));
     zhash_destroy (&copy);
 
+    // Test foreach
+    assert (0 == zhash_foreach (hash, test_foreach, hash));
+    assert (-1 == zhash_foreach (hash, test_foreach_error, hash));
+
     //  Test save and load
     zhash_save (hash, ".cache");
     copy = zhash_new ();