- 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

Makefile.am

@@ -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.

configure.ac

@@ -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

doc/Makefile.am

@@ -0,0 +1,10 @@
+## -*- mode: make; tab-width: 4 -*-
+## $Id$
+
+include $(top_srcdir)/Makefile.incl
+
+if HAVE_DOCBOOK2X_MAN
+  MAYBE_MANPAGES = manpages
+endif
+
+SUBDIRS = $(MAYBE_MANPAGES)

doc/manpages/Makefile.am

@@ -3,15 +3,20 @@
 
 include $(top_srcdir)/Makefile.incl
 
-if HAVE_DOCBOOK2X_MAN
+if ENABLE_CLIENT
-man_MANS = \
+  CLIENT_MANS = boinc_client.1 boinc_cmd.1
-    boinc_client.1 \
-    boinc_cmd.1 \
-    boincmgr.1
-else
-man_MANS = 
 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) $<