3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 23:36:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1827 from bluca/make_dist_missing_files

Browse Source 
Problem: make dist does not tar up macros.hpp
This commit is contained in:
Pieter Hintjens 2016-03-09 10:40:37 +01:00
commit 24d12dc30a
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -85,6 +85,7 @@ src_libzmq_la_SOURCES = \
src/lb.cpp \ src/lb.cpp \
src/lb.hpp \ src/lb.hpp \
src/likely.hpp \ src/likely.hpp \
src/macros.hpp \
src/mailbox.cpp \ src/mailbox.cpp \
src/mailbox.hpp \ src/mailbox.hpp \
src/mailbox_safe.cpp \ src/mailbox_safe.cpp \

5
ci_build.sh
View File

@ -27,9 +27,8 @@ if [ $BUILD_TYPE == "default" ]; then
( (
./autogen.sh && ./autogen.sh &&
./configure "${CONFIG_OPTS[@]}" && ./configure "${CONFIG_OPTS[@]}" &&
make && export DISTCHECK_CONFIGURE_FLAGS="${CONFIG_OPTS[@]}" &&
( if make check; then true; else cat test-suite.log; exit 1; fi ) && make VERBOSE=1 distcheck
make install
) || exit 1 ) || exit 1
else else
cd ./builds/${BUILD_TYPE} && ./ci_build.sh cd ./builds/${BUILD_TYPE} && ./ci_build.sh

10
doc/Makefile.am
View File

@ -23,22 +23,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 \ 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 zmq_vmci.7 zmq_null.7 zmq_plain.7 zmq_curve.7 zmq_tipc.7 zmq_vmci.7
MAN_DOC = $(MAN1) $(MAN3) $(MAN7) MAN_DOC =
MAN_TXT = $(MAN3:%.3=%.txt) MAN_TXT = $(MAN3:%.3=%.txt)
MAN_TXT += $(MAN7:%.7=%.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) EXTRA_DIST = asciidoc.conf $(MAN_TXT)
if INSTALL_MAN if INSTALL_MAN
MAN_DOC += $(MAN1) $(MAN3) $(MAN7)
dist_man_MANS = $(MAN_DOC) dist_man_MANS = $(MAN_DOC)
MAINTAINERCLEANFILES += $(MAN_DOC)
endif endif
if BUILD_DOC if BUILD_DOC
MAN_HTML += $(MAN_TXT:%.txt=%.html)
EXTRA_DIST += $(MAN_HTML) EXTRA_DIST += $(MAN_HTML)
MAINTAINERCLEANFILES += $(MAN_HTML)
SUFFIXES=.html .txt .xml .3 .7 SUFFIXES=.html .txt .xml .3 .7