Mercurial > octave-nkf
diff doc/module.mk @ 20363:fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
* scripts/module.mk: New file created from scripts/Makefile.am
* scripts/Makefile.am: Delete.
* Makefile.am (SUBDIRS): Remove scripts from the list.
* configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile from the list.
* doc/interpreter/images.awk, doc/module.mk, etc/module.mk,
scripts/@ftp/module.mk, scripts/audio/module.mk,
scripts/deprecated/module.mk, scripts/elfun/module.mk,
scripts/general/module.mk, scripts/geometry/module.mk,
scripts/gui/module.mk, scripts/help/module.mk,
scripts/image/module.mk, scripts/io/module.mk, scripts/java/module.mk,
scripts/linear-algebra/module.mk, scripts/miscellaneous/module.mk,
scripts/optimization/module.mk, scripts/path/module.mk,
scripts/pkg/module.mk, scripts/plot/appearance/module.mk,
scripts/plot/draw/module.mk, scripts/plot/util/module.mk,
scripts/polynomial/module.mk, scripts/prefs/module.mk,
scripts/set/module.mk, scripts/signal/module.mk,
scripts/sparse/module.mk, scripts/specfun/module.mk,
scripts/special-matrix/module.mk, scripts/startup/module.mk,
scripts/statistics/base/module.mk,
scripts/statistics/distributions/module.mk,
scripts/statistics/models/module.mk,
scripts/statistics/tests/module.mk, scripts/strings/module.mk,
scripts/testfun/module.mk, scripts/time/module.mk: Update for
non-recursive build.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 10 Jul 2015 14:40:47 -0400 |
| parents | 0ce7d8303152 |
| children | 3904d83e47d1 |
line wrap: on
line diff
--- a/doc/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/doc/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,9 +1,10 @@ TEXINFO_TEX = doc/texinfo.tex TEXINPUTS := $(PATH_SEPARATOR)$(top_srcdir)/doc/interpreter$(PATH_SEPARATOR)$(PATH_SEPARATOR)$(top_builddir)/doc/interpreter$(PATH_SEPARATOR)$(TEXINPUTS)$(PATH_SEPARATOR) -export TEXINPUTS TEXMFCNF := $(PATH_SEPARATOR)$(top_srcdir)/doc$(PATH_SEPARATOR)$(top_builddir)/doc$(PATH_SEPARATOR)$(TEXMFCNF)$(PATH_SEPARATOR) + +export TEXINPUTS export TEXMFCNF DVIPS = dvips @@ -94,7 +95,7 @@ doc/interpreter/octave-config.1 \ doc/interpreter/octave.1 -JAVA_IMAGES = \ +DOC_JAVA_IMAGES = \ doc/interpreter/java-images/image001.png \ doc/interpreter/java-images/image002.png \ doc/interpreter/java-images/image003.png \ @@ -105,30 +106,30 @@ doc/interpreter/java-images/image008.png \ doc/interpreter/java-images/image009.png -BUILT_IMAGES = \ - $(IMAGES_EPS) \ - $(IMAGES_PDF) \ - $(IMAGES_PNG) \ - $(IMAGES_TXT) +BUILT_DOC_IMAGES = \ + $(DOC_IMAGES_EPS) \ + $(DOC_IMAGES_PDF) \ + $(DOC_IMAGES_PNG) \ + $(DOC_IMAGES_TXT) -IMAGES = \ - $(BUILT_IMAGES) \ - $(JAVA_IMAGES) +DOC_IMAGES += \ + $(BUILT_DOC_IMAGES) \ + $(DOC_JAVA_IMAGES) -$(BUILT_IMAGES): $(OCTAVE_INTERPRETER_TARGETS) +$(BUILT_DOC_IMAGES): $(OCTAVE_INTERPRETER_TARGETS) -## FIXME: JAVA_IMAGES will eventually need to be added to the HTML build. +## FIXME: DOC_JAVA_IMAGES will eventually need to be added to the HTML build. ## It will require a different Makefile rule later because -## JAVA_IMAGES live in a subdir rather than in the current directory. +## DOC_JAVA_IMAGES live in a subdir rather than in the current directory. -HTMLDIR_IMAGES = $(patsubst doc/interpreter/%.png, doc/interpreter/octave.html/%.png, $(IMAGES_PNG)) +HTMLDIR_IMAGES = $(patsubst doc/interpreter/%.png, doc/interpreter/octave.html/%.png, $(DOC_IMAGES_PNG)) LOGOS = \ doc/interpreter/octave_logo.eps \ doc/interpreter/octave_logo.pdf -IMAGES_EPS += doc/interpreter/octave_logo.eps -IMAGES_PDF += doc/interpreter/octave_logo.pdf +DOC_IMAGES_EPS += doc/interpreter/octave_logo.eps +DOC_IMAGES_PDF += doc/interpreter/octave_logo.pdf MUNGED_TEXI_SRC = \ doc/interpreter/arith.texi \ @@ -211,10 +212,10 @@ OCTAVE_HTML_TMP_DIR = $(OCTAVE_HTML_DIR:.html=.htp) OCTAVE_HTML_STAMP = $(OCTAVE_HTML_DIR)/.html-stamp -$(srcdir)/doc/interpreter/octave.info: $(IMAGES_TXT) $(octave_TEXINFOS) -doc/interpreter/octave.dvi: $(IMAGES_EPS) $(octave_TEXINFOS) -doc/interpreter/octave.pdf: $(IMAGES_PDF) $(octave_TEXINFOS) -$(OCTAVE_HTML_STAMP): $(IMAGES_PNG) $(octave_TEXINFOS) +$(srcdir)/doc/interpreter/octave.info: $(DOC_IMAGES_TXT) $(octave_TEXINFOS) +doc/interpreter/octave.dvi: $(DOC_IMAGES_EPS) $(octave_TEXINFOS) +doc/interpreter/octave.pdf: $(DOC_IMAGES_PDF) $(octave_TEXINFOS) +$(OCTAVE_HTML_STAMP): $(DOC_IMAGES_PNG) $(octave_TEXINFOS) $(srcdir)/doc/interpreter/octave.info: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ @@ -298,9 +299,6 @@ $(top_builddir)/run-octave -f -q -H $(srcdir)/doc/interpreter/mk_doc_cache.m - $(srcdir)/doc/interpreter/macros.texi $(DOCSTRING_FILES) >$@-t && \ mv $@-t $@ -scripts/.DOCSTRINGS: - $(MAKE) -C scripts .DOCSTRINGS - $(MUNGED_TEXI_SRC): $(DOCSTRING_DEPS) $(munge_texi_SOURCES) %.texi : %.txi doc/interpreter/munge-texi.pl doc/interpreter/$(octave_dirstamp) @@ -349,8 +347,8 @@ doc/interpreter/mk_doc_cache.m \ doc/interpreter/mkcontrib.awk \ doc/interpreter/munge-texi.pl \ - $(IMAGES) \ - $(IMAGES_SRC) \ + $(DOC_IMAGES) \ + $(DOC_IMAGES_SRC) \ $(LOGOS) \ $(TXI_SRC) @@ -362,7 +360,7 @@ $(OCTAVE_HTML_STAMP) MAINTAINERCLEANFILES += \ - $(BUILT_IMAGES) \ + $(BUILT_DOC_IMAGES) \ doc/interpreter/doc-cache DIRSTAMP_FILES += doc/interpreter/$(octave_dirstamp)