# HG changeset patch
# User Mike Miller <mtmiller@octave.org>
# Date 1437850503 14400
# Node ID 0fbe2e28ea84469a8f6632ea68a2a2001429d9fe
# Parent  39721c09691bc19cd045272fcaf94a30eacb8a05
build: Avoid triggering rebuild of docs when DOCSTRINGS regenerated (bug #45567)

* doc/module.mk: Make generated files depend on $(DOCSTRING_FILES) again.
(DOCSTRING_FILES) Delete, initialized elsewhere now.
(DOCSTRING_DEPS) Delete, no longer used.
* Makefile.am (DOCSTRING_FILES): Initialize to empty.
* libinterp/module.mk (DOCSTRING_FILES): Include libinterp/DOCSTRINGS in
the list.  (libinterp/DOCSTRINGS): New target with an order-only dependency
on libinterp/.DOCSTRINGS.
* scripts/module.mk (DOCSTRING_FILES): Include scripts/DOCSTRINGS in the
list.  (scripts/DOCSTRINGS): New target with an order-only dependency on
scripts/.DOCSTRINGS.

diff -r 39721c09691b -r 0fbe2e28ea84 Makefile.am
--- a/Makefile.am	Fri Jul 24 19:58:18 2015 -0400
+++ b/Makefile.am	Sat Jul 25 14:55:03 2015 -0400
@@ -86,6 +86,7 @@
 PKG_ADD_FILES =
 SCRIPTS_IMAGES =
 JAR_FILES =
+DOCSTRING_FILES =
 
 bin_PROGRAMS =
 archlib_PROGRAMS =
diff -r 39721c09691b -r 0fbe2e28ea84 doc/module.mk
--- a/doc/module.mk	Fri Jul 24 19:58:18 2015 -0400
+++ b/doc/module.mk	Sat Jul 25 14:55:03 2015 -0400
@@ -303,16 +303,12 @@
   doc/interpreter/doc-cache \
   doc/interpreter/macros.texi
 
-DOCSTRING_FILES = $(shell $(srcdir)/doc/interpreter/find-docstring-files.sh "$(top_srcdir)")
-
-DOCSTRING_DEPS = scripts/.DOCSTRINGS libinterp/.DOCSTRINGS
-
-doc/interpreter/doc-cache: $(DOCSTRING_DEPS) doc/interpreter/mk_doc_cache.m | $(OCTAVE_INTERPRETER_TARGETS) doc/interpreter/$(octave_dirstamp)
+doc/interpreter/doc-cache: $(DOCSTRING_FILES) doc/interpreter/mk_doc_cache.m | $(OCTAVE_INTERPRETER_TARGETS) doc/interpreter/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	$(top_builddir)/run-octave -f -q -H $(srcdir)/doc/interpreter/mk_doc_cache.m - $(srcdir)/doc/interpreter/macros.texi $(DOCSTRING_FILES) > $@-t && \
 	mv $@-t $@
 
-$(MUNGED_TEXI_SRC): $(DOCSTRING_DEPS) $(munge_texi_SOURCES)
+$(MUNGED_TEXI_SRC): $(DOCSTRING_FILES) $(munge_texi_SOURCES)
 
 %.texi : %.txi doc/interpreter/munge-texi.pl | doc/interpreter/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t $@ && \
diff -r 39721c09691b -r 0fbe2e28ea84 libinterp/module.mk
--- a/libinterp/module.mk	Fri Jul 24 19:58:18 2015 -0400
+++ b/libinterp/module.mk	Sat Jul 25 14:55:03 2015 -0400
@@ -295,6 +295,10 @@
 
 if AMCOND_BUILD_DOCS
 
+DOCSTRING_FILES += libinterp/DOCSTRINGS
+
+libinterp/DOCSTRINGS: | libinterp/.DOCSTRINGS
+
 libinterp/.DOCSTRINGS: $(ALL_DEF_FILES) libinterp/gendoc.pl
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/libinterp/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
diff -r 39721c09691b -r 0fbe2e28ea84 scripts/module.mk
--- a/scripts/module.mk	Fri Jul 24 19:58:18 2015 -0400
+++ b/scripts/module.mk	Sat Jul 25 14:55:03 2015 -0400
@@ -100,6 +100,10 @@
 
 if AMCOND_BUILD_DOCS
 
+DOCSTRING_FILES += scripts/DOCSTRINGS
+
+scripts/DOCSTRINGS: | scripts/.DOCSTRINGS
+
 scripts/.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) scripts/mkdoc.pl Makefile
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/scripts/DOCSTRINGS ] && [ ! -f scripts/DOCSTRINGS ]; then \