Commit 3516beb2 authored by Frank Thomas's avatar Frank Thomas

- Created doc/Makefile.am so that SUBDIRS in the toplevel Makefile.am only

  contains direct subdirectories, otherwise automake < 1.9 fails. Thanks to
  Bernd Machenschalk for the hint.
- Made manpages in doc/Makefile a conditional subdirectory, see "7.2.2
  Conditional subdirectories with AM_CONDITIONAL" in the automake manual.
- Made manpage creation dependent on the AM_CONDITIONALs ENABLE_CLIENT,
  BUILD_CLIENTGUI and ENABLE_SERVER to create only those manpages whose
  binaries are going to be compiled.

svn path=/trunk/boinc/; revision=13842
parent 8396e06f
......@@ -22,7 +22,7 @@ endif
# ORDER MATTERS below. One must build dependencies FIRST, then things
# that depend on them later
SUBDIRS = m4 $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) doc/manpages
SUBDIRS = m4 $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) doc
# Putting a directory name recursively copies the entire contents - the
# dist-hook below gets rid of CVS directories.
......
......@@ -674,6 +674,7 @@ AC_CONFIG_FILES([
client/Makefile
client/win/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
db/Makefile
doc/Makefile
doc/manpages/Makefile
lib/Makefile
Makefile
......
## -*- mode: make; tab-width: 4 -*-
## $Id$
include $(top_srcdir)/Makefile.incl
if HAVE_DOCBOOK2X_MAN
MAYBE_MANPAGES = manpages
endif
SUBDIRS = $(MAYBE_MANPAGES)
......@@ -3,15 +3,20 @@
include $(top_srcdir)/Makefile.incl
if HAVE_DOCBOOK2X_MAN
man_MANS = \
boinc_client.1 \
boinc_cmd.1 \
boincmgr.1
else
man_MANS =
if ENABLE_CLIENT
CLIENT_MANS = boinc_client.1 boinc_cmd.1
endif
if BUILD_CLIENTGUI
CLIENTGUI_MANS = boincmgr.1
endif
if ENABLE_SERVER
SERVER_MANS =
endif
man_MANS = $(CLIENT_MANS) $(CLIENTGUI_MANS) $(SERVER_MANS)
%.1: %.xml
$(DOCBOOK2X_MAN) $<
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment