comparison libinterp/corefcn/module.mk @ 20557:818122703f1e

Use CXXFLAGS to build *.df files (fix regression by 0ce7d8303152) * libinterp/module.mk, libinterp/corefcn/module.mk, libinterp/octave-value/module.mk: add CXXFLAGS since mumble_CXXFLAGS only includes AM_CXXFLAGS and WARN_CXXFLAGS, and automake does not add it automatically for this custome rules.
author Carnë Draug <carandraug@octave.org>
date Sat, 26 Sep 2015 16:32:28 +0100
parents c6224b4e7774
children fcb792acab9b
comparison
equal deleted inserted replaced
20556:048f7cda88ea 20557:818122703f1e
269 ## with FT2_CPPFLAGS, FONTCONFIG_CPPFLAGS 269 ## with FT2_CPPFLAGS, FONTCONFIG_CPPFLAGS
270 $(COREFCN_FT2_DF) : libinterp/corefcn/%.df : libinterp/corefcn/%.cc $(GENERATED_MAKE_BUILTINS_INCS) 270 $(COREFCN_FT2_DF) : libinterp/corefcn/%.df : libinterp/corefcn/%.cc $(GENERATED_MAKE_BUILTINS_INCS)
271 $(AM_V_GEN)rm -f $@-t $@-t1 $@ && \ 271 $(AM_V_GEN)rm -f $@-t $@-t1 $@ && \
272 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 272 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
273 $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) \ 273 $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) \
274 $(libinterp_corefcn_libcorefcn_la_CXXFLAGS) \ 274 $(libinterp_corefcn_libcorefcn_la_CXXFLAGS) $(CXXFLAGS) \
275 -DMAKE_BUILTINS $< > $@-t1 && \ 275 -DMAKE_BUILTINS $< > $@-t1 && \
276 $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ 276 $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \
277 rm -f $@-t1 && \ 277 rm -f $@-t1 && \
278 mv $@-t $@ 278 mv $@-t $@
279 279