summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2012-05-13 12:44:23 +0200
committerMartin Sustrik <sustrik@250bpm.com>2012-05-14 05:59:04 +0200
commit193f1e5208d782b7ee9f31922a908ecd80291cd5 (patch)
tree905490659664d045caab7797ff58e09d1ac73ba2
parent8826d6cdfba218115f1ece9c1b8531d223d616b6 (diff)
libzmq and tests MSVC projects added to distribution
The package (tarball, zip) was missing these MSVC projects which means libzmq and tests could not be built from the package, only from git. This patch fixes the problem. Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--Makefile.am20
-rw-r--r--builds/msvc/Makefile.am9
-rw-r--r--tests/Makefile.am3
3 files changed, 21 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index b249d29..57d0aa1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,18 +9,18 @@ endif
DIST_SUBDIRS = foreign/openpgm src doc perf tests builds/msvc
EXTRA_DIST = \
- autogen.sh \
- m4/ax_pthread.m4 \
- version.sh \
+ autogen.sh \
+ m4/ax_pthread.m4 \
+ version.sh \
foreign/openpgm/@pgm_basename@.tar.gz
MAINTAINERCLEANFILES = \
- $(srcdir)/aclocal.m4 \
- $(srcdir)/m4/ltversion.m4 \
- $(srcdir)/m4/ltoptions.m4 \
- $(srcdir)/m4/lt~obsolete.m4 \
- $(srcdir)/m4/libtool.m4 \
- $(srcdir)/m4/ltsugar.m4 \
- $(srcdir)/configure \
+ $(srcdir)/aclocal.m4 \
+ $(srcdir)/m4/ltversion.m4 \
+ $(srcdir)/m4/ltoptions.m4 \
+ $(srcdir)/m4/lt~obsolete.m4 \
+ $(srcdir)/m4/libtool.m4 \
+ $(srcdir)/m4/ltsugar.m4 \
+ $(srcdir)/configure \
`find "$(srcdir)" -type f -name Makefile.in -print`
dist-hook:
diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am
index 68877d6..e02c125 100644
--- a/builds/msvc/Makefile.am
+++ b/builds/msvc/Makefile.am
@@ -24,4 +24,11 @@ PROPERTIES_DIST = properties/Common.props \
PRECOMPILED_DIST = ../../src/precompiled.hpp \
../../src/precompiled.cpp
-EXTRA_DIST = $(LIBXS_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST)
+TESTS_DIST = tests/tests.vcxproj \
+ tests/tests.vcxproj.filters
+
+LIBZMQ_DIST = libzmq/libzmq.vcxproj \
+ libzmq/libzmq.vcxproj.filters
+
+EXTRA_DIST = $(LIBXS_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) \
+ $(TESTS_DIST) $(LIBZMQ_DIST)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 71442a2..27ca5dd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,3 +54,6 @@ shutdown_SOURCES = shutdown.cpp
backlog_SOURCES = backlog.cpp
TESTS = $(noinst_PROGRAMS)
+
+EXTRA_DIST = tests.cpp
+