Mercurial > octave-nkf

comparison libinterp/corefcn/module.mk @ 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 25601fe8c6f7
comparison
equal deleted inserted replaced
17829:c2d9d42f4fe1 17830:f22714d4a5da
259 corefcn/xpow.cc \ 259 corefcn/xpow.cc \
260 corefcn/zfstream.cc \ 260 corefcn/zfstream.cc \
261 $(JIT_SRC) \ 261 $(JIT_SRC) \
262 $(C_COREFCN_SRC) 262 $(C_COREFCN_SRC)
263 263
264 COREFCN_FT2_DF = \
265 corefcn/graphics.df \
266 corefcn/gl-render.df \
267 corefcn/toplev.df \
268 corefcn/txt-eng-ft.df
269
264 ## FIXME: Automake does not support per-object rules. 270 ## FIXME: Automake does not support per-object rules.
265 ## These rules could be emulated by creating a new convenience 271 ## These rules could be emulated by creating a new convenience
266 ## library and using per-library rules. Or we can just live 272 ## library and using per-library rules. Or we can just live
267 ## without the rule since there haven't been any problems. (09/18/2012) 273 ## without the rule since there haven't been any problems. (09/18/2012)
268 #display.df display.lo: CPPFLAGS += $(X11_FLAGS) 274 #display.df display.lo: CPPFLAGS += $(X11_FLAGS)
275
276 ## Special rules for FreeType .df files so that not all .df files are built
277 ## with FT2_CPPFLAGS, FONTCONFIG_CPPFLAGS
278 $(COREFCN_FT2_DF) : corefcn/%.df : corefcn/%.cc
279 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
280 $(AM_CPPFLAGS) $(FONTCONFIG_CPPFLAGS) $(FT2_CPPFLAGS) $(CPPFLAGS) \
281 $(AM_CXXFLAGS) $(CXXFLAGS) \
282 -DMAKE_BUILTINS $< > $@-t
283 $(srcdir)/mkdefs $(srcdir) $< < $@-t > $@
284 rm $@-t
269 285
270 ## Special rules for sources which must be built before rest of compilation. 286 ## Special rules for sources which must be built before rest of compilation.
271 287
272 ## defaults.h and graphics.h must depend on Makefile. Calling configure 288 ## defaults.h and graphics.h must depend on Makefile. Calling configure
273 ## may change default/config values. However, calling configure will also 289 ## may change default/config values. However, calling configure will also