Mercurial > octave-nkf

changeset 20402:6b7c10920dfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make interpreter targets and dirstamp files order-only prerequisites * doc/module.mk, libgui/graphics/module.mk, libgui/module.mk, libgui/qterminal-module.mk, libgui/src/module.mk, scripts/java/module.mk, src/module.mk, test/module.mk: Make the $(OCTAVE_INTERPRETER_TARGETS) and dirstamp files order-only prerequisites for other files since we only need for them to exist.
author John W. Eaton <jwe@octave.org>
date Fri, 17 Jul 2015 15:18:35 -0400
parents 9b44691a3520
children 2f9119bb3fe5
files doc/module.mk libgui/graphics/module.mk libgui/module.mk libgui/qterminal-module.mk libgui/src/module.mk scripts/java/module.mk src/module.mk test/module.mk
diffstat 8 files changed, 36 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/doc/module.mk	Fri Jul 17 14:44:47 2015 -0400
+++ b/doc/module.mk	Fri Jul 17 15:18:35 2015 -0400
@@ -42,7 +42,7 @@
   doc/doxyhtml/Doxyfile.in \
   doc/doxyhtml/README
 
-doxyhtml: doc/doxyhtml/$(octave_dirstamp)
+doxyhtml: | doc/doxyhtml/$(octave_dirstamp)
 	doxygen doc/doxyhtml/Doxyfile
 
 doxyhtml-maintainer-clean:
@@ -62,7 +62,7 @@
   doc/interpreter/plot-surfaceproperties.texi \
   doc/interpreter/plot-textproperties.texi
 
-$(GRAPH_PROP_TEXI_SRC): $(OCTAVE_INTERPRETER_TARGETS)
+$(GRAPH_PROP_TEXI_SRC): | $(OCTAVE_INTERPRETER_TARGETS)
 
 define gen-propdoc-texi
   rm -f $@-t $@ && \
@@ -126,7 +126,7 @@
   $(BUILT_DOC_IMAGES) \
   $(DOC_JAVA_IMAGES)
 
-$(BUILT_DOC_IMAGES): $(OCTAVE_INTERPRETER_TARGETS)
+$(BUILT_DOC_IMAGES): | $(OCTAVE_INTERPRETER_TARGETS)
 
 ## FIXME: DOC_JAVA_IMAGES will eventually need to be added to the HTML build.
 ##        It will require a different Makefile rule later because
@@ -249,19 +249,19 @@
 	fi; \
 	rm -rf $$backupdir; exit $$rc
 
-doc/interpreter/octave.dvi: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi doc/interpreter/$(am__dirstamp)
+doc/interpreter/octave.dvi: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi | doc/interpreter/$(am__dirstamp)
 	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc/interpreter -I $(abs_top_srcdir)/doc/interpreter' \
 	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
 	`test -f 'doc/interpreter/octave.texi' || echo '$(abs_top_srcdir)/'`doc/interpreter/octave.texi
 
-doc/interpreter/octave.pdf: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi doc/interpreter/$(am__dirstamp)
+doc/interpreter/octave.pdf: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi | doc/interpreter/$(am__dirstamp)
 	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc/interpreter -I $(abs_top_srcdir)/doc/interpreter' \
 	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
 	`test -f 'doc/interpreter/octave.texi' || echo '$(abs_top_srcdir)/'`doc/interpreter/octave.texi
 
-$(OCTAVE_HTML_STAMP): doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi doc/interpreter/$(am__dirstamp)
+$(OCTAVE_HTML_STAMP): doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi | doc/interpreter/$(am__dirstamp)
 	$(AM_V_MAKEINFO)rm -rf $(OCTAVE_HTML_DIR)
 	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc/interpreter -I $(abs_top_srcdir)/doc/interpreter \
 	 -o $(OCTAVE_HTML_TMP_DIR) `test -f 'doc/interpreter/octave.texi' || echo '$(abs_top_srcdir)/'`doc/interpreter/octave.texi; \
@@ -316,24 +316,24 @@
 
 DOCSTRING_DEPS = scripts/.DOCSTRINGS libinterp/.DOCSTRINGS
 
-doc/interpreter/doc-cache: $(DOCSTRING_DEPS) $(OCTAVE_INTERPRETER_TARGETS) doc/interpreter/mk_doc_cache.m doc/interpreter/$(octave_dirstamp)
+doc/interpreter/doc-cache: $(DOCSTRING_DEPS) 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)
 
-%.texi : %.txi doc/interpreter/munge-texi.pl doc/interpreter/$(octave_dirstamp)
+%.texi : %.txi doc/interpreter/munge-texi.pl | doc/interpreter/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	$(PERL) $(srcdir)/doc/interpreter/munge-texi.pl $(top_srcdir) $(DOCSTRING_FILES) < $< > $@-t && \
 	mv $@-t $@
 
-doc/interpreter/contributors.texi: doc/interpreter/contributors.in doc/interpreter/$(octave_dirstamp)
+doc/interpreter/contributors.texi: doc/interpreter/contributors.in | doc/interpreter/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	$(AWK) -f $(srcdir)/doc/interpreter/mkcontrib.awk $(srcdir)/doc/interpreter/contributors.in > $@-t && \
 	mv $@-t $@
 
-AUTHORS: doc/interpreter/preface.texi doc/interpreter/contributors.texi doc/interpreter/$(octave_dirstamp)
+AUTHORS: doc/interpreter/preface.texi doc/interpreter/contributors.texi | doc/interpreter/$(octave_dirstamp)
 	$(AM_V_MAKEINFO)rm -f $@-t $@ && \
 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/doc/interpreter/contributors.texi ] && [ ! -f doc/interpreter/contributors.texi ]; then \
 		cp $(srcdir)/doc/interpreter/contributors.texi doc/interpreter/contributors.texi; \
@@ -343,13 +343,13 @@
 	  --no-validate --no-headers --no-split --output $@-t $< && \
 	mv $@-t $@
 
-BUGS: doc/interpreter/bugs.texi doc/interpreter/$(octave_dirstamp)
+BUGS: doc/interpreter/bugs.texi | doc/interpreter/$(octave_dirstamp)
 	$(AM_V_MAKEINFO)rm -f $@-t $@ && \
 	$(MAKEINFO) -D BUGSONLY -I $(srcdir)/doc/interpreter \
 	  --no-validate --no-headers --no-split --output $@-t $< && \
 	mv $@-t $@
 
-INSTALL.OCTAVE: doc/interpreter/install.texi doc/interpreter/$(octave_dirstamp)
+INSTALL.OCTAVE: doc/interpreter/install.texi | doc/interpreter/$(octave_dirstamp)
 	$(AM_V_MAKEINFO)rm -f $@-t $@ && \
 	$(MAKEINFO) -D INSTALLONLY -I $(srcdir)/doc/interpreter \
 	  --no-validate --no-headers --no-split --output $@-t $< && \
@@ -485,12 +485,12 @@
 $(srcdir)/doc/interpreter/images.mk: $(srcdir)/doc/interpreter/config-images.sh $(srcdir)/doc/interpreter/images.awk $(srcdir)/doc/interpreter/images
 	$(srcdir)/doc/interpreter/config-images.sh $(top_srcdir)
 
-$(refcard_DVI) : %.dvi : %.tex doc/refcard/$(octave_dirstamp)
+$(refcard_DVI) : %.dvi : %.tex | doc/refcard/$(octave_dirstamp)
 	-$(AM_V_TEX)cd $(@D) && \
 	TEXINPUTS="$(abs_top_srcdir)/doc/refcard:$(TEXINPUTS):" \
 	$(TEX) $(<F) $(AM_V_texidevnull)
 
-$(refcard_PDF) : %.pdf : %.tex doc/refcard/$(octave_dirstamp)
+$(refcard_PDF) : %.pdf : %.tex | doc/refcard/$(octave_dirstamp)
 	-$(AM_V_PDFTEX)cd $(@D) && \
 	TEXINPUTS="$(abs_top_srcdir)/doc/refcard:$(TEXINPUTS):" \
 	$(PDFTEX) $(<F) $(AM_V_texidevnull)
@@ -517,7 +517,7 @@
 
 SPELLCHECK_FILES = $(MUNGED_TEXI_SRC:.texi=.scheck)
 
-%.scheck: %.texi doc/interpreter/$(octave_dirstamp)
+%.scheck: %.texi | doc/interpreter/$(octave_dirstamp)
 	$(srcdir)/doc/interpreter/doccheck/spellcheck $< > $@-t
 	mv $@-t $@
 	[ -s $@ ] || rm -f $@
--- a/libgui/graphics/module.mk	Fri Jul 17 14:44:47 2015 -0400
+++ b/libgui/graphics/module.mk	Fri Jul 17 15:18:35 2015 -0400
@@ -19,7 +19,7 @@
   libgui/graphics/moc-ToggleTool.cc \
   libgui/graphics/moc-ToolBar.cc
 
-$(OCTAVE_GUI_GRAPHICS_MOC): libgui/graphics/$(octave_dirstamp)
+$(OCTAVE_GUI_GRAPHICS_MOC): | libgui/graphics/$(octave_dirstamp)
 
 DIRSTAMP_FILES += \
   libgui/graphics/$(octave_dirstamp)
@@ -32,13 +32,13 @@
 
 octave_gui_graphics_UI_H = $(patsubst libgui/graphics/%.ui, libgui/graphics/ui-%.h, $(octave_gui_graphics_UI))
 
-$(octave_gui_graphics_UI_H): libgui/graphics/$(octave_dirstamp)
+$(octave_gui_graphics_UI_H): | libgui/graphics/$(octave_dirstamp)
 
 BUILT_SOURCES += $(octave_gui_graphics_UI_H)
 
 octave_gui_graphics_RC = libgui/graphics/qrc-qthandles.cc
 
-$(octave_gui_graphics_RC): libgui/graphics/$(octave_dirstamp)
+$(octave_gui_graphics_RC): | libgui/graphics/$(octave_dirstamp)
 
 noinst_HEADERS += \
   libgui/graphics/__init_qt__.h \
--- a/libgui/module.mk	Fri Jul 17 14:44:47 2015 -0400
+++ b/libgui/module.mk	Fri Jul 17 15:18:35 2015 -0400
@@ -68,7 +68,7 @@
 
 octlocale_DATA += $(LOCALES)
 
-libgui/default-qt-settings: libgui/default-qt-settings.in libgui/$(octave_dirstamp)
+libgui/default-qt-settings: libgui/default-qt-settings.in | libgui/$(octave_dirstamp)
 	$(AM_V_GEN)$(do_subst_qt_settings)
 
 DIRSTAMP_FILES += \
@@ -106,7 +106,7 @@
 am__v_lrelease_0 = -silent
 am__v_lrelease_1 =
 
-%.qm: %.ts libgui/languages/$(octave_dirstamp)
+%.qm: %.ts | libgui/languages/$(octave_dirstamp)
 	$(AM_V_GEN)$(LRELEASE) $(AM_V_lrelease) -qm $@ $<
 
 DIRSTAMP_FILES += \
--- a/libgui/qterminal-module.mk	Fri Jul 17 14:44:47 2015 -0400
+++ b/libgui/qterminal-module.mk	Fri Jul 17 15:18:35 2015 -0400
@@ -29,7 +29,7 @@
 OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_MOC = \
   libgui/qterminal/libqterminal/moc-QTerminal.cc
 
-$(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_MOC): libgui/qterminal/libqterminal/$(octave_dirstamp)
+$(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_MOC): | libgui/qterminal/libqterminal/$(octave_dirstamp)
 
 DIRSTAMP_FILES += \
   libgui/qterminal/libqterminal/$(octave_dirstamp)
@@ -62,7 +62,7 @@
 libgui_qterminal_libqterminal_la_MOC += \
   $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_WIN32_MOC)
 
-$(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_WIN32_MOC): libgui/qterminal/libqterminal/win32/$(octave_dirstamp)
+$(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_WIN32_MOC): | libgui/qterminal/libqterminal/win32/$(octave_dirstamp)
 
 DIRSTAMP_FILES += \
   libgui/qterminal/libqterminal/win32/$(octave_dirstamp)
@@ -105,7 +105,7 @@
 libgui_qterminal_libqterminal_la_MOC += \
   $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC)
 
-$(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC): libgui/qterminal/libqterminal/unix/$(octave_dirstamp)
+$(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC): | libgui/qterminal/libqterminal/unix/$(octave_dirstamp)
 
 DIRSTAMP_FILES += \
   libgui/qterminal/libqterminal/unix/$(octave_dirstamp)
--- a/libgui/src/module.mk	Fri Jul 17 14:44:47 2015 -0400
+++ b/libgui/src/module.mk	Fri Jul 17 15:18:35 2015 -0400
@@ -70,7 +70,7 @@
   libgui/src/m-editor/moc-octave-qscintilla.cc \
   libgui/src/m-editor/moc-octave-txt-lexer.cc
 
-$(OCTAVE_GUI_SRC_M_EDITOR_MOC): libgui/src/m-editor/$(octave_dirstamp)
+$(OCTAVE_GUI_SRC_M_EDITOR_MOC): | libgui/src/m-editor/$(octave_dirstamp)
 
 octave_gui_MOC += \
   $(OCTAVE_GUI_SRC_M_EDITOR_MOC)
@@ -108,7 +108,7 @@
 
 octave_gui_RC = libgui/src/qrc-resource.cc
 
-$(octave_gui_RC): libgui/src/$(octave_dirstamp)
+$(octave_gui_RC): | libgui/src/$(octave_dirstamp)
 
 DIRSTAMP_FILES += \
   libgui/src/$(octave_dirstamp)
@@ -118,7 +118,7 @@
 
 octave_gui_UI_H = $(patsubst libgui/src/%.ui, libgui/src/ui-%.h, $(octave_gui_UI))
 
-$(octave_gui_UI_H): libgui/src/$(octave_dirstamp)
+$(octave_gui_UI_H): | libgui/src/$(octave_dirstamp)
 
 BUILT_SOURCES += $(octave_gui_UI_H)
 
--- a/scripts/java/module.mk	Fri Jul 17 14:44:47 2015 -0400
+++ b/scripts/java/module.mk	Fri Jul 17 15:18:35 2015 -0400
@@ -51,7 +51,7 @@
 
 srcdir_scripts_java_JAVA_IMAGES = $(addprefix $(srcdir)/scripts/java/, $(JAVA_IMAGES))
 
-$(scripts_java_JAVA_CLASSES) : %.class : %.java scripts/java/$(octave_dirstamp)
+$(scripts_java_JAVA_CLASSES) : %.class : %.java | scripts/java/$(octave_dirstamp)
 	$(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
 	( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
 
--- a/src/module.mk	Fri Jul 17 14:44:47 2015 -0400
+++ b/src/module.mk	Fri Jul 17 15:18:35 2015 -0400
@@ -162,7 +162,7 @@
 src/$(host_triplet)-mkoctfile$(BUILD_EXEEXT): src/$(host_triplet)-mkoctfile.cc
 	$(BUILD_CXX) -o src/$(host_triplet)-mkoctfile$(BUILD_EXEEXT) -Dgnulib='' -Doctave_idx_type=int $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) src/$(host_triplet)-mkoctfile.cc
 
-src/$(host_triplet)-mkoctfile.cc: src/mkoctfile.in.cc Makefile src/$(octave_dirstamp)
+src/$(host_triplet)-mkoctfile.cc: src/mkoctfile.in.cc Makefile | src/$(octave_dirstamp)
 	$(AM_V_GEN)$(do_subst_cross_config_vals)
 
 ## Building cross octave-config.
@@ -172,7 +172,7 @@
 src/$(host_triplet)-octave-config$(BUILD_EXEEXT): src/$(host_triplet)-octave-config.cc
 	$(BUILD_CXX) -o src/$(host_triplet)-octave-config$(BUILD_EXEEXT) -Dgnulib='' -Doctave_idx_type=int $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) src/$(host_triplet)-octave-config.cc
 
-src/$(host_triplet)-octave-config.cc: src/octave-config.in.cc Makefile src/$(octave_dirstamp)
+src/$(host_triplet)-octave-config.cc: src/octave-config.in.cc Makefile | src/$(octave_dirstamp)
 	$(AM_V_GEN)$(do_subst_default_vals)
 
 mostlyclean-local:
@@ -180,17 +180,17 @@
 
 endif
 
-src/octave-config.cc: src/octave-config.in.cc Makefile src/$(octave_dirstamp)
+src/octave-config.cc: src/octave-config.in.cc Makefile | src/$(octave_dirstamp)
 	$(AM_V_GEN)$(do_subst_default_vals)
 
-src/mkoctfile.cc: src/mkoctfile.in.cc Makefile src/$(octave_dirstamp)
+src/mkoctfile.cc: src/mkoctfile.in.cc Makefile | src/$(octave_dirstamp)
 	$(AM_V_GEN)$(do_subst_config_vals)
 
 ## main.cc must depend on Makefile.  Calling configure may change
 ## default/config values.  However, calling configure will also
 ## regenerate the Makefiles from Makefile.am and trigger the rules below.
 
-src/main.cc: src/main.in.cc Makefile src/$(octave_dirstamp)
+src/main.cc: src/main.in.cc Makefile | src/$(octave_dirstamp)
 	$(AM_V_GEN)$(do_subst_default_vals)
 
 ALL_LOCAL_TARGETS += $(OCTAVE_VERSION_LINKS) $(OCTAVE_CROSS_TOOLS)
--- a/test/module.mk	Fri Jul 17 14:44:47 2015 -0400
+++ b/test/module.mk	Fri Jul 17 15:18:35 2015 -0400
@@ -57,15 +57,15 @@
 test/.gdbinit: etc/gdbinit
 	@$(gdbinit_install_rule)
 
-check-local: $(GENERATED_TEST_FILES) $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
+check-local: $(GENERATED_TEST_FILES) | $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
 	cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test
 
 if AMCOND_HAVE_LLVM
-check-jit: $(GENERATED_TEST_FILES) $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
+check-jit: $(GENERATED_TEST_FILES) | $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
 	cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --jit-compiler --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test
 endif
 
-test/sparse.tst: test/build-sparse-tests.sh test/$(octave_dirstamp)
+test/sparse.tst: test/build-sparse-tests.sh | test/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	$(srcdir)/test/build-sparse-tests.sh > $@-t && \
 	mv $@-t $@
@@ -78,7 +78,7 @@
 
 $(GENERATED_BC_OVERLOADS_FILES): test/bc-overload-tests.stamp
 
-test/bc-overload-tests.stamp: test/build-bc-overload-tests.sh test/bc-overloads-expected test/$(octave_dirstamp)
+test/bc-overload-tests.stamp: test/build-bc-overload-tests.sh test/bc-overloads-expected | test/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@ && \
 	$(srcdir)/test/build-bc-overload-tests.sh test $(srcdir)/test/bc-overloads-expected && \
 	touch $@