changeset 12307:3dc4cfc5a3c1 release-3-4-x

Use pattern-style rules to make .texi files rather than older suffix-style rules.
author Rik <octave@nomad.inbox5.com>
date Sun, 30 Jan 2011 22:44:52 -0800
parents eedeed3ee849
children b6e47a4de018
files doc/ChangeLog doc/interpreter/Makefile.am
diffstat 2 files changed, 21 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-30  Rik  <octave@nomad.inbox5.com>
+
+	* interpreter/Makefile.am: Use pattern-style rules to make .texi files
+	rather than older suffix-style rules.
+
 2011-01-30  Rik  <octave@nomad.inbox5.com>
 
 	* interpreter/octave.texi: Add new section
--- a/doc/interpreter/Makefile.am
+++ b/doc/interpreter/Makefile.am
@@ -39,12 +39,13 @@
   octave-config.1 \
   octave.1
 
-## The following example files are listed for dependencies.
-## They should not be distributed from this directory.
+## The following files are included in the manual via the @EXAMPLEFILE macro.
+## They are dependencies for the documentation.
+## They must not be distributed from this directory.
 EXAMPLE_FILES = \
-  $(top_srcdir)/examples/@FIRfilter/display.m \
+  $(top_srcdir)/examples/@FIRfilter/FIRfilter.m \
   $(top_srcdir)/examples/@FIRfilter/FIRfilter_aggregation.m \
-  $(top_srcdir)/examples/@FIRfilter/FIRfilter.m \
+  $(top_srcdir)/examples/@FIRfilter/display.m \
   $(top_srcdir)/examples/@FIRfilter/subsasgn.m \
   $(top_srcdir)/examples/@FIRfilter/subsref.m \
   $(top_srcdir)/examples/@polynomial/display.m \
@@ -81,7 +82,6 @@
   $(top_srcdir)/examples/unwinddemo.cc
 
 
-
 include images.mk
 
 $(srcdir)/images.mk: $(srcdir)/config-images.sh $(srcdir)/images.awk $(srcdir)/images
@@ -187,7 +187,7 @@
 
 $(MUNGED_TEXI_SRC): $(DOCSTRING_FILES) $(munge_texi_SOURCES)
 
-.txi.texi:
+%.texi: %.txi
 	@$(MAKE) $(AM_MAKEFLAGS) munge-texi$(BUILD_EXEEXT)
 	./munge-texi $(top_srcdir) $(DOCSTRING_FILES) < $< > $@-t
 	mv $@-t $@
@@ -196,11 +196,11 @@
 	$(AWK) -f $(srcdir)/mkcontrib.awk $(srcdir)/contributors.in > $@-t
 	mv $@-t $@
 
-../../INSTALL.OCTAVE: install.texi
-	rm -f INSTALL
-	-$(MAKEINFO) -D INSTALLONLY \
-	  --no-validate --no-headers --no-split --output INSTALL $<
-	mv INSTALL ../../INSTALL.OCTAVE
+../../AUTHORS: preface.texi contributors.texi
+	rm -f AUTHORS
+	-$(MAKEINFO) -D AUTHORSONLY \
+	  --no-validate --no-headers --no-split --output AUTHORS $<
+	mv AUTHORS ../../AUTHORS
 
 ../../BUGS: bugs.texi
 	rm -f BUGS
@@ -208,11 +208,11 @@
 	  --no-validate --no-headers --no-split --output BUGS $<
 	mv BUGS ../../BUGS
 
-../../AUTHORS: preface.texi contributors.texi
-	rm -f AUTHORS
-	-$(MAKEINFO) -D AUTHORSONLY \
-	  --no-validate --no-headers --no-split --output AUTHORS $<
-	mv AUTHORS ../../AUTHORS
+../../INSTALL.OCTAVE: install.texi
+	rm -f INSTALL
+	-$(MAKEINFO) -D INSTALLONLY \
+	  --no-validate --no-headers --no-split --output INSTALL $<
+	mv INSTALL ../../INSTALL.OCTAVE
 
 undocumented_list:
 	rm -f $@