Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce automake recursion; simplify pgm dependency #1208

Merged
merged 2 commits into from
Oct 14, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
595 changes: 584 additions & 11 deletions Makefile.am

Large diffs are not rendered by default.

338 changes: 162 additions & 176 deletions configure.ac

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#
# documentation
#
MAN3 = zmq_bind.3 zmq_unbind.3 zmq_connect.3 zmq_disconnect.3 zmq_close.3 \
zmq_ctx_new.3 zmq_ctx_term.3 zmq_ctx_get.3 zmq_ctx_set.3 zmq_ctx_shutdown.3 \
zmq_msg_init.3 zmq_msg_init_data.3 zmq_msg_init_size.3 \
Expand All @@ -21,20 +24,17 @@ MAN_TXT = $(MAN3:%.3=%.txt)
MAN_TXT += $(MAN7:%.7=%.txt)
MAN_HTML = $(MAN_TXT:%.txt=%.html)

if INSTALL_MAN
dist_man_MANS = $(MAN_DOC)
endif
MAINTAINERCLEANFILES = $(MAN_DOC) $(MAN_HTML)

EXTRA_DIST = asciidoc.conf $(MAN_TXT)

if BUILD_DOC
EXTRA_DIST += $(MAN_HTML)
endif

MAINTAINERCLEANFILES = $(MAN_DOC) $(MAN_HTML)

dist-hook : $(MAN_DOC) $(MAN_HTML)
if INSTALL_MAN
dist_man_MANS = $(MAN_DOC)
endif

if BUILD_DOC
SUFFIXES=.html .txt .xml .3 .7

.txt.html:
Expand All @@ -52,3 +52,5 @@ SUFFIXES=.html .txt .xml .3 .7
zmq_epgm.7: zmq_pgm.7
cp $< $@
endif

dist-hook : $(MAN_DOC) $(MAN_HTML)
8 changes: 0 additions & 8 deletions foreign/openpgm/Makefile.am

This file was deleted.

Binary file removed foreign/openpgm/libpgm-5.2.122~dfsg.tar.gz
Binary file not shown.
22 changes: 0 additions & 22 deletions perf/Makefile.am

This file was deleted.

219 changes: 0 additions & 219 deletions src/Makefile.am

This file was deleted.

Loading