Mercurial > octave

changeset 21254:076876f0a83a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Declare dependency on octave-config.h for generating *.df files * libinterp/module.mk (%.df: %.cc): Depend on octave-config.h. * libinterp/corefcn/module.mk (COREFCN_FT2_DF): Likewise. * libinterp/octave-value/module.mk (OV_JAVA_DF): Likewise.
author Mike Miller <mtmiller@octave.org>
date Fri, 12 Feb 2016 18:07:07 -0800
parents a66a737913b5
children af8118df8292
files libinterp/corefcn/module.mk libinterp/module.mk libinterp/octave-value/module.mk
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/module.mk	Fri Feb 12 16:28:51 2016 -0500
+++ b/libinterp/corefcn/module.mk	Fri Feb 12 18:07:07 2016 -0800
@@ -273,7 +273,7 @@
 
 ## Special rules for FreeType .df files so that not all .df files are built
 ## with FT2_CPPFLAGS, FONTCONFIG_CPPFLAGS
-$(COREFCN_FT2_DF) : libinterp/corefcn/%.df : libinterp/corefcn/%.cc $(GENERATED_MAKE_BUILTINS_INCS)
+$(COREFCN_FT2_DF) : libinterp/corefcn/%.df : libinterp/corefcn/%.cc $(GENERATED_MAKE_BUILTINS_INCS) octave-config.h
 	$(AM_V_GEN)rm -f $@-t $@-t1 $@ && \
 	$(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	  $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) \
--- a/libinterp/module.mk	Fri Feb 12 16:28:51 2016 -0500
+++ b/libinterp/module.mk	Fri Feb 12 18:07:07 2016 -0800
@@ -216,7 +216,7 @@
 ## Rule to build a DEF file from a .cc file
 ## See also module.mk files for overrides when speciall CPPFLAGS are needed.
 ## FIXME: Shouldn't the build stop if CPP fails here?  Yes (10/31/2013)
-%.df: %.cc $(GENERATED_MAKE_BUILTINS_INCS)
+%.df: %.cc $(GENERATED_MAKE_BUILTINS_INCS) octave-config.h
 	$(AM_V_GEN)rm -f $@-t $@-t1 $@ && \
 	$(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	  $(libinterp_liboctinterp_la_CPPFLAGS) $(LLVM_CPPFLAGS) $(CPPFLAGS) \
--- a/libinterp/octave-value/module.mk	Fri Feb 12 16:28:51 2016 -0500
+++ b/libinterp/octave-value/module.mk	Fri Feb 12 18:07:07 2016 -0800
@@ -136,7 +136,7 @@
 
 ## Special rules for Java .df files so that not all .df files are built with
 ## JAVA_CPPFLAGS
-$(OV_JAVA_DF) : libinterp/octave-value/%.df : libinterp/octave-value/%.cc $(GENERATED_MAKE_BUILTINS_INCS)
+$(OV_JAVA_DF) : libinterp/octave-value/%.df : libinterp/octave-value/%.cc $(GENERATED_MAKE_BUILTINS_INCS) octave-config.h
 	$(AM_V_GEN)rm -f $@-t $@-t1 $@ && \
 	$(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	  $(libinterp_octave_value_liboctave_value_la_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \