Merge pull request #1826 from bluca/make_dist

Problem: make dist is borken
This commit is contained in:
Pieter Hintjens 2016-02-22 13:36:21 +01:00
commit 8b32073c7b
3 changed files with 22 additions and 27 deletions

1
.gitignore vendored
View File

@ -163,6 +163,7 @@ builds/msvc/**/*Release
builds/redhat/zeromq.spec
builds/android/prefix/
packaging/nuget/*.nupkg
packaging/redhat/zeromq.spec
foreign/openpgm/*
!foreign/openpgm/*.tar.bz2
!foreign/openpgm/*.tar.gz

View File

@ -21,14 +21,11 @@ EXTRA_DIST = \
cmake/Modules/ZMQSourceRunChecks.cmake \
cmake/NSIS.template32.in \
cmake/platform.hpp.in \
cmake/Makefile.am \
cmake/Makefile \
cmake/NSIS.template64.in \
cmake/Makefile.in \
valgrind/valgrind.supp \
valgrind/vg \
nuget/readme.nuget \
nuget/libzmq.autopkg \
qt-android/android_build_helper.sh \
qt-android/ci_build.sh \
qt-android/build.sh
android/android_build_helper.sh \
android/ci_build.sh \
android/build.sh

View File

@ -3,7 +3,6 @@ LIBZMQ_DIST = vs2008/libzmq.sln \
vs2010/libzmq.sln \
vs2010/libzmq/libzmq.vcxproj \
vs2010/libzmq/libzmq.vcxproj.filters \
vs2010/libzmq/libzmq.props \
vs2010/libzmq/libzmq.xml \
vs2010/libzmq.import.props \
vs2010/libzmq.import.xml \
@ -12,7 +11,6 @@ LIBZMQ_DIST = vs2008/libzmq.sln \
vs2012/libzmq.sln \
vs2012/libzmq/libzmq.vcxproj \
vs2012/libzmq/libzmq.vcxproj.filters \
vs2012/libzmq/libzmq.props \
vs2012/libzmq/libzmq.xml \
vs2012/libzmq.import.props \
vs2012/libzmq.import.xml \
@ -21,7 +19,6 @@ LIBZMQ_DIST = vs2008/libzmq.sln \
vs2013/libzmq.sln \
vs2013/libzmq/libzmq.vcxproj \
vs2013/libzmq/libzmq.vcxproj.filters \
vs2013/libzmq/libzmq.props \
vs2013/libzmq/libzmq.xml \
vs2013/libzmq.import.props \
vs2013/libzmq.import.xml \
@ -41,36 +38,36 @@ PERF_DIST = vs2008/local_lat/local_lat.vcproj \
vs2010/remote_thr/remote_thr.vcxproj \
vs2010/inproc_lat/inproc_lat.vcxproj \
vs2010/inproc_thr/inproc_thr.vcxproj \
vs2010/local_lat/local_lat.props \
vs2010/local_thr/local_thr.props \
vs2010/remote_lat/remote_lat.props \
vs2010/remote_thr/remote_thr.props \
vs2010/inproc_lat/inproc_lat.props \
vs2010/inproc_thr/inproc_thr.props \
vs2010/local_lat/local_lat.vcxproj \
vs2010/local_thr/local_thr.vcxproj \
vs2010/remote_lat/remote_lat.vcxproj \
vs2010/remote_thr/remote_thr.vcxproj \
vs2010/inproc_lat/inproc_lat.vcxproj \
vs2010/inproc_thr/inproc_thr.vcxproj \
vs2012/local_lat/local_lat.vcxproj \
vs2012/local_thr/local_thr.vcxproj \
vs2012/remote_lat/remote_lat.vcxproj \
vs2012/remote_thr/remote_thr.vcxproj \
vs2012/inproc_lat/inproc_lat.vcxproj \
vs2012/inproc_thr/inproc_thr.vcxproj \
vs2012/local_lat/local_lat.vcxproj \
vs2012/local_thr/local_thr.vcxproj \
vs2012/remote_lat/remote_lat.vcxproj \
vs2012/remote_thr/remote_thr.vcxproj \
vs2012/inproc_lat/inproc_lat.vcxproj \
vs2012/inproc_thr/inproc_thr.vcxproj \
vs2012/local_lat/local_lat.props \
vs2012/local_thr/local_thr.props \
vs2012/remote_lat/remote_lat.props \
vs2012/remote_thr/remote_thr.props \
vs2012/inproc_lat/inproc_lat.props \
vs2012/inproc_thr/inproc_thr.props \
vs2013/local_lat/local_lat.vcxproj \
vs2013/local_thr/local_thr.vcxproj \
vs2013/remote_lat/remote_lat.vcxproj \
vs2013/remote_thr/remote_thr.vcxproj \
vs2013/inproc_lat/inproc_lat.vcxproj \
vs2013/inproc_thr/inproc_thr.vcxproj \
vs2013/local_lat/local_lat.props \
vs2013/local_thr/local_thr.props \
vs2013/remote_lat/remote_lat.props \
vs2013/remote_thr/remote_thr.props \
vs2013/inproc_lat/inproc_lat.props \
vs2013/inproc_thr/inproc_thr.props
vs2013/local_lat/local_lat.vcxproj \
vs2013/local_thr/local_thr.vcxproj \
vs2013/remote_lat/remote_lat.vcxproj \
vs2013/remote_thr/remote_thr.vcxproj \
vs2013/inproc_lat/inproc_lat.vcxproj \
vs2013/inproc_thr/inproc_thr.vcxproj
PROPERTIES_DIST = properties/Common.props \
properties/DebugDEXE.props \