0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-23 05:20:07 +00:00

Merge pull request from bluca/builds_make_dist

Problem: missing files in release tarballs
This commit is contained in:
Pieter Hintjens 2016-05-04 12:46:47 +02:00
commit 56b71af22d
5 changed files with 37 additions and 4 deletions

@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I config
SUBDIRS = doc
DIST_SUBDIRS = builds/msvc doc
DIST_SUBDIRS = doc builds builds/msvc
pkgconfig_DATA = src/libzmq.pc

2
NEWS

@ -25,6 +25,8 @@
* Fixed #114 - cannot unbind with same endpoint with IPv6 enabled.
* Fixed #1952 - CMake scripts not part of release tarballs
0MQ version 4.1.4 stable, released on 2015/12/18
================================================

26
builds/Makefile.am Normal file

@ -0,0 +1,26 @@
# Specify all build files that have to go into source packages.
# msvc directory does its own stuff.
EXTRA_DIST = \
zos/makelibzmq \
zos/cxxall \
zos/README.md \
zos/makeclean \
zos/platform.hpp \
zos/zc++ \
zos/test_fork.cpp \
zos/maketests \
zos/runtests \
mingw32/Makefile.mingw32 \
mingw32/platform.hpp \
cmake/Modules \
cmake/Modules/FindAsciiDoc.cmake \
cmake/Modules/TestZMQVersion.cmake \
cmake/Modules/ZMQSourceRunChecks.cmake \
cmake/NSIS.template32.in \
cmake/platform.hpp.in \
cmake/NSIS.template64.in \
valgrind/valgrind.supp \
valgrind/vg \
nuget/readme.nuget \
nuget/libzmq.autopkg

@ -560,6 +560,7 @@ AC_CONFIG_FILES([ \
Makefile \
src/libzmq.pc \
doc/Makefile \
builds/Makefile \
builds/msvc/Makefile \
builds/redhat/zeromq.spec])

@ -18,22 +18,26 @@ MAN3 = zmq_bind.3 zmq_unbind.3 zmq_connect.3 zmq_disconnect.3 zmq_close.3 \
MAN7 = zmq.7 zmq_tcp.7 zmq_pgm.7 zmq_inproc.7 zmq_ipc.7 \
zmq_null.7 zmq_plain.7 zmq_curve.7 zmq_tipc.7
MAN_DOC = $(MAN1) $(MAN3) $(MAN7)
MAN_DOC =
MAN_TXT = $(MAN3:%.3=%.txt)
MAN_TXT += $(MAN7:%.7=%.txt)
MAN_HTML = $(MAN_TXT:%.txt=%.html)
MAN_HTML =
MAINTAINERCLEANFILES = $(MAN_DOC) $(MAN_HTML)
MAINTAINERCLEANFILES =
EXTRA_DIST = asciidoc.conf $(MAN_TXT)
if INSTALL_MAN
MAN_DOC += $(MAN1) $(MAN3) $(MAN7)
dist_man_MANS = $(MAN_DOC)
MAINTAINERCLEANFILES += $(MAN_DOC)
endif
if BUILD_DOC
MAN_HTML += $(MAN_TXT:%.txt=%.html)
EXTRA_DIST += $(MAN_HTML)
MAINTAINERCLEANFILES += $(MAN_HTML)
SUFFIXES=.html .txt .xml .3 .7