Mercurial > octave

comparison libinterp/Makefile.am @ 17830:f22714d4a5da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
17829:c2d9d42f4fe1 17830:f22714d4a5da
226 ## in Octave version 3.12. 226 ## in Octave version 3.12.
227 DLL_CDEFS = @OCTINTERP_DLL_DEFS@ 227 DLL_CDEFS = @OCTINTERP_DLL_DEFS@
228 DLL_CXXDEFS = @OCTINTERP_DLL_DEFS@ 228 DLL_CXXDEFS = @OCTINTERP_DLL_DEFS@
229 229
230 ## Rule to build a DEF file from a .cc file 230 ## Rule to build a DEF file from a .cc file
231 ## 231 ## See also module.mk files for overrides when speciall CPPFLAGS are needed.
232 ## FIXME: This rule should be fixed to avoid using special
233 ## flags like JAVA_CPPFLAGS for every file. How could it be written
234 ## so that it uses octave_value_liboctave_value_la_CPPFLAGS when
235 ## generating the octave-value/*.df files?
236 ##
237 ## FIXME: Shouldn't the build stop if CPP fails here? Yes (10/31/2013) 232 ## FIXME: Shouldn't the build stop if CPP fails here? Yes (10/31/2013)
238 %.df: %.cc 233 %.df: %.cc
239 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 234 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
240 $(AM_CPPFLAGS) $(FONTCONFIG_CPPFLAGS) $(FT2_CPPFLAGS) \ 235 $(AM_CPPFLAGS) $(LLVM_CPPFLAGS) $(CPPFLAGS) \
241 $(JAVA_CPPFLAGS) $(LLVM_CPPFLAGS) $(CPPFLAGS) \
242 $(AM_CXXFLAGS) $(CXXFLAGS) \ 236 $(AM_CXXFLAGS) $(CXXFLAGS) \
243 -DMAKE_BUILTINS $< | $(srcdir)/mkdefs $(srcdir) $< > $@-t 237 -DMAKE_BUILTINS $< > $@-t
244 mv $@-t $@ 238 $(srcdir)/mkdefs $(srcdir) $< < $@-t > $@
239 rm $@-t
245 240
246 ## Rules to build test files 241 ## Rules to build test files
247 242
248 TST_FILES_SRC := $(shell $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(ULT_DIST_SRC) $(DLDFCN_SRC)) 243 TST_FILES_SRC := $(shell $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(ULT_DIST_SRC) $(DLDFCN_SRC))
249 244