Mercurial > octave-nkf

changeset 8296:6d5a7cba5177

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc/interpreter/Makefile.in: eliminate move-if-change from rules
author John W. Eaton <jwe@octave.org>
date Fri, 31 Oct 2008 06:35:32 -0400
parents 16819ca24fa5
children dc62132651db
files doc/ChangeLog doc/interpreter/Makefile.in
diffstat 2 files changed, 23 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/doc/ChangeLog	Thu Oct 30 18:03:37 2008 -0400
+++ b/doc/ChangeLog	Fri Oct 31 06:35:32 2008 -0400
@@ -1,3 +1,16 @@
+2008-10-31  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/Makefile.in ($(TEXINFO)): Depend directly on
+	../../src/DOCSTRINGS and ../../scripts/DOCSTRINGS instead of phony
+	src-DOCSTRINGS and scripts-DOCSTRINGS targets.
+	(src-DOCSTRINGS, scripts-DOCSTRINGS): Delete.
+	(DOCSTRING_FILES): New variable.
+	($(SUB_TEXFINO)): Use it.  Display actual command.
+	($(DOCSTRING_FILES)): New target.
+	(%.spell : %.texi): Use -t suffix instead of .tmp.
+	(constributors.texi, $(SUB_TEXINFO)): Use mv, instead of
+	$(simple-move-if-change-rule).
+
 2008-10-30  David Bateman  <dbateman@free.fr>
 
 	* faq/Octave-FAQ.texi: Document improved indexing and add an faq for
--- a/doc/interpreter/Makefile.in	Thu Oct 30 18:03:37 2008 -0400
+++ b/doc/interpreter/Makefile.in	Fri Oct 31 06:35:32 2008 -0400
@@ -167,28 +167,25 @@
 
 %.spell : %.texi
 	rm -f $@
-	$(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
-	mv $@.tmp $@
+	$(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@-t
+	mv $@-t $@
 
 all: octave.info octave.pdf octave-a4.pdf HTML/index.html
 .PHONY: all
 
-$(TEXINFO): src-DOCSTRINGS scripts-DOCSTRINGS munge-texi$(BUILD_EXEEXT)
+DOCSTRING_FILES := $(TOPDIR)/src/DOCSTRINGS $(TOPDIR)/scripts/DOCSTRINGS
+
+$(TEXINFO): $(DOCSTRING_FILES) munge-texi$(BUILD_EXEEXT)
 
 munge-texi$(BUILD_EXEEXT): munge-texi.cc
 	$(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS)
 
-src-DOCSTRINGS:
-	$(MAKE) -C ../../src DOCSTRINGS
-.PHONY: src-DOCSTRINGS
-
-scripts-DOCSTRINGS:
-	$(MAKE) -C ../../scripts DOCSTRINGS
-.PHONY: scripts-DOCSTRINGS
+$(DOCSTRING_FILES):
+	$(MAKE) -C $(dir $@) $(notdir $@)
 
 contributors.texi: contributors.in
 	$(AWK) -f $(srcdir)/mkcontrib.awk $(srcdir)/contributors.in > $@-t
-	@$(simple-move-if-change-rule)
+	mv $@-t $@
 
 octave-a4.texi: $(MAIN_TEXINFO)
 	cp $< $@
@@ -197,11 +194,8 @@
 	cp $< $@
 
 $(SUB_TEXINFO) : %.texi : %.txi
-	@echo making $@ from $<
-	@./munge-texi \
-	  -d $(TOPDIR)/src/DOCSTRINGS \
-	  -d $(TOPDIR)/scripts/DOCSTRINGS < $< > $@-t
-	@$(simple-move-if-change-rule)
+	./munge-texi $(foreach f, $(DOCSTRING_FILES), -d $(f)) < $< > $@-t
+	mv $@-t $@
 
 octave.info: $(IMAGES_TXT) $(TEXINFO) $(EXAMPLE_FILES)
 	-$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $(MAIN_TEXINFO)