Mercurial > hg > octave-lyh

changeset 9679:0896714301e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
script/Makefile.in: tweak rules for building DOCSTRINGS
author John W. Eaton <jwe@octave.org>
date Thu, 01 Oct 2009 11:10:10 -0400
parents c929f09457b7
children 73153525df9a
files scripts/ChangeLog scripts/Makefile.in
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-01  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (plot/gnuplot_binary.m): New rule.
+	(DOCSTRINGS): Depend on plot/gnuplot_binary.m.
+	(ALL_M_FILES): Define with =, not :=.
+
 2009-10-01  Jaroslav Hajek  <highegg@gmail.com>
 
 	* geometry/griddata.m: Fix handling vector xi, yi.
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -41,7 +41,9 @@
   M_FILE_DIRS := $(srcdir) .
 endif
 
-ALL_M_FILES := $(shell find $(M_FILE_DIRS) -name '*.m' -print)
+## Define this with =, not := so that the generated plot/gnuplot_binary.m
+## file will be included in the list when it is available.
+ALL_M_FILES = $(shell find $(M_FILE_DIRS) -name '*.m' -print)
 
 DISTFILES = $(addprefix $(srcdir)/, Makefile.in ChangeLog $(SOURCES) \
 	configure.ac configure mkinstalldirs mkdoc mkpkgadd gethelp.cc \
@@ -79,7 +81,11 @@
 	$(MAKE) -C $@ all
 .PHONY: $(SUBDIRS)
 
-DOCSTRINGS: gethelp$(BUILD_EXEEXT) mkdoc $(ALL_M_FILES)
+## Kluge alert:
+plot/gnuplot_binary.m:
+	$(MAKE) -C plot $(notdir $@)
+
+DOCSTRINGS: plot/gnuplot_binary.m gethelp$(BUILD_EXEEXT) mkdoc $(ALL_M_FILES)
 	$(srcdir)/mkdoc $(ALL_M_FILES) > $@.t
 	mv $@.t $@