Mercurial > octave
diff libinterp/Makefile.am @ 17830:f22714d4a5da
build: Don't use JAVA_CPPFLAGS, FT2_CPPFLAGS everywhere when making .df files.
*.cc -> *.df rule now stops build when it fails (as it should have done before).
* libinterp/Makefile.am: Remove FONTCONFIG_CPPFLAGS, FT2_CPPFLAGS,
JAVA_CPPFLAGS from defaulte *.cc -> *.df rule. Abort make if rule
errors out.
* libinterp/corefcn/module.mk: Add overriding *.cc -> *.df rule
for files which use (FONTCONFIG|FT2)_CPPFLAGS.
* libinterp/octave-value/module.mk: Add overriding *.cc -> *.df rule
for files which use JAVA_CPPFLAGS.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 02 Nov 2013 14:34:02 -0700 |
parents | 3488d987eb50 |
children | 97e49b588f5d c0c61619917e |
line wrap: on
line diff
--- a/libinterp/Makefile.am Sat Nov 02 14:46:43 2013 -0400 +++ b/libinterp/Makefile.am Sat Nov 02 14:34:02 2013 -0700 @@ -228,20 +228,15 @@ DLL_CXXDEFS = @OCTINTERP_DLL_DEFS@ ## Rule to build a DEF file from a .cc file -## -## FIXME: This rule should be fixed to avoid using special -## flags like JAVA_CPPFLAGS for every file. How could it be written -## so that it uses octave_value_liboctave_value_la_CPPFLAGS when -## generating the octave-value/*.df files? -## +## 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 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(FONTCONFIG_CPPFLAGS) $(FT2_CPPFLAGS) \ - $(JAVA_CPPFLAGS) $(LLVM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CPPFLAGS) $(LLVM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) \ - -DMAKE_BUILTINS $< | $(srcdir)/mkdefs $(srcdir) $< > $@-t - mv $@-t $@ + -DMAKE_BUILTINS $< > $@-t + $(srcdir)/mkdefs $(srcdir) $< < $@-t > $@ + rm $@-t ## Rules to build test files