# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1330900939 28800
# Node ID e053d1622f4ea3e155566d6740fe63785f5a20c2
# Parent  f22a9555aa690033ae746834d76e1ace55308720
build: Don't build DOCSTRINGS files when --disable-docs specified.

* Makefile.am, scripts/Makefile.am, src/Makefile.am: Use AMCOND blocks to
disable unnecessary documentation building when --disable-docs specified.

diff -r f22a9555aa69 -r e053d1622f4e Makefile.am
--- a/Makefile.am	Sun Mar 04 13:57:42 2012 -0800
+++ b/Makefile.am	Sun Mar 04 14:42:19 2012 -0800
@@ -70,8 +70,7 @@
 # Subdirectories in which to run `make all'.
 SUBDIRS = libgnu libcruft liboctave src scripts @DOCDIR@ examples test
 
-if AMCOND_BUILD_DOCS
-else
+if ! AMCOND_BUILD_DOCS
 dist-hook:
 	echo "Documentation disabled.  Cannot package distribution!" ; exit 1;
 endif
@@ -119,8 +118,10 @@
 	  cp $< $@; \
 	fi
 
+if AMCOND_BUILD_DOCS
 AUTHORS BUGS INSTALL.OCTAVE:
 	$(MAKE) -C doc/interpreter ../../$@
+endif
 .PHONY: AUTHORS BUGS INSTALL.OCTAVE
 
 ChangeLog:
diff -r f22a9555aa69 -r e053d1622f4e scripts/Makefile.am
--- a/scripts/Makefile.am	Sun Mar 04 13:57:42 2012 -0800
+++ b/scripts/Makefile.am	Sun Mar 04 14:42:19 2012 -0800
@@ -74,7 +74,11 @@
 
 FCN_FILES_IN = $(GEN_FCN_FILES:.m=.in)
 
+if AMCOND_BUILD_DOCS
 all-local: $(GEN_FCN_FILES) $(PKG_ADD_FILES) .DOCSTRINGS
+else
+all-local: $(GEN_FCN_FILES) $(PKG_ADD_FILES)
+endif
 
 octave_dirstamp = $(am__leading_dot)dirstamp
 
@@ -320,6 +324,7 @@
 	$(MKDIR_P) time
 	: > time/$(octave_dirstamp)
 
+if AMCOND_BUILD_DOCS
 ## Program compiled only to help build documentation.  No installation needed.
 noinst_PROGRAMS = gethelp
 
@@ -335,6 +340,7 @@
 	@$(srcdir)/mkdoc "$(srcdir)" $(FCN_FILES) -- $(GEN_FCN_FILES) > $@
 	$(top_srcdir)/build-aux/move-if-change $@ DOCSTRINGS
 	touch $@
+endif
 
 $(GEN_FCN_FILES) : %.m : %.in Makefile
 	@$(do_subst_config_vals)
diff -r f22a9555aa69 -r e053d1622f4e src/Makefile.am
--- a/src/Makefile.am	Sun Mar 04 13:57:42 2012 -0800
+++ b/src/Makefile.am	Sun Mar 04 14:42:19 2012 -0800
@@ -661,6 +661,7 @@
 __init_fltk__.lo __init_fltk__.o: \
   AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS))
 
+if AMCOND_BUILD_DOCS
 .DOCSTRINGS: gendoc$(BUILD_EXEEXT)
 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
 		cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
@@ -683,6 +684,9 @@
 	$(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS)
 
 all-local: $(OCT_STAMP_FILES) $(DLD_FUNCTIONS_PKG_ADD_FILE) .DOCSTRINGS
+else
+all-local: $(OCT_STAMP_FILES) $(DLD_FUNCTIONS_PKG_ADD_FILE)
+endif
 
 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
 octave-config.cc: octave-config.cc.in Makefile