# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1355322936 18000
# Node ID a2a2c241f2d58d1b6a18dca31f63815c11467426
# Parent  e665645fb402b9f88cd5f9a59f730423e00d6ba4
use JAVA_CPPFLAGS when building .df files.

* Makefile.am (%.df : %.cc): Use $(JAVA_CPPFLAGS) here.

diff -r e665645fb402 -r a2a2c241f2d5 libinterp/Makefile.am
--- 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 $@