Mercurial > octave-nkf
changeset 15768:a2a2c241f2d5
use JAVA_CPPFLAGS when building .df files.
* Makefile.am (%.df : %.cc): Use $(JAVA_CPPFLAGS) here.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 12 Dec 2012 09:35:36 -0500 |
| parents | e665645fb402 |
| children | eade542fedaa |
| files | libinterp/Makefile.am |
| diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/Makefile.am Wed Dec 12 08:38:22 2012 -0500 +++ b/libinterp/Makefile.am Wed Dec 12 09:35:36 2012 -0500 @@ -216,9 +216,17 @@ 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? +## +## FIXME -- Shouldn't the build stop if CPP fails here? %.df: %.cc $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(AM_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) \ -DMAKE_BUILTINS $< | $(srcdir)/mkdefs $(srcdir) $< > $@-t mv $@-t $@