Mercurial > octave-nkf

comparison libinterp/octave-value/module.mk @ 20557:818122703f1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9b44691a3520
children
comparison
equal deleted inserted replaced
20556:048f7cda88ea 20557:818122703f1e
136 ## JAVA_CPPFLAGS 136 ## JAVA_CPPFLAGS
137 $(OV_JAVA_DF) : libinterp/octave-value/%.df : libinterp/octave-value/%.cc $(GENERATED_MAKE_BUILTINS_INCS) 137 $(OV_JAVA_DF) : libinterp/octave-value/%.df : libinterp/octave-value/%.cc $(GENERATED_MAKE_BUILTINS_INCS)
138 $(AM_V_GEN)rm -f $@-t $@-t1 $@ && \ 138 $(AM_V_GEN)rm -f $@-t $@-t1 $@ && \
139 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 139 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
140 $(libinterp_octave_value_liboctave_value_la_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \ 140 $(libinterp_octave_value_liboctave_value_la_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \
141 $(libinterp_octave_value_liboctave_value_la_CXXFLAGS) \ 141 $(libinterp_octave_value_liboctave_value_la_CXXFLAGS) $(CXXFLAGS) \
142 -DMAKE_BUILTINS $< > $@-t1 && \ 142 -DMAKE_BUILTINS $< > $@-t1 && \
143 $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ 143 $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \
144 mv $@-t $@ && \ 144 mv $@-t $@ && \
145 rm -f $@-t1 145 rm -f $@-t1
146 146