[Plplot-cvs] plplot/bindings/java Makefile.am,1.40,1.41

[Alan W. I. <ai...@us...>]

Update of /cvsroot/plplot/plplot/bindings/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5061/bindings/java

Modified Files:
	Makefile.am 
Log Message:
Brute force changes to make separated build tree work.
Note, octave doesn't work, and there is a small issue with pltclgen
accessing buildtree files rather than source tree files, but otherwise
the separated build works with these changes.

N.B.  No further testing done yet (such as make check, make install).


Index: Makefile.am
===================================================================
RCS file: /cvsroot/plplot/plplot/bindings/java/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Makefile.am	13 Jul 2004 21:53:46 -0000	1.40
+++ Makefile.am	14 Jul 2004 01:20:06 -0000	1.41
@@ -22,8 +22,9 @@
 
 SWIG_SUPPORT_DIR = $(top_srcdir)/bindings/swig-support
 PLPLOTCAPI_I = $(SWIG_SUPPORT_DIR)/plplotcapi.i
+SWIG_JAVA_DIR = $(top_srcdir)/bindings/java
 
-SWIG_CMD = $(SWIG) -I$(SWIG_SUPPORT_DIR) -DPL_DOUBLE -DSWIG_JAVA -java 
+SWIG_CMD = $(SWIG) -I$(SWIG_SUPPORT_DIR) -I$(SWIG_JAVA_DIR) -DPL_DOUBLE -DSWIG_JAVA -java 
 
 swigjavafiles = \
 	plplotjavacJNI.java \
@@ -38,9 +39,9 @@
 swiggenfiles = $(swigjavafiles) $(swigcfiles)
 
 javafiles = \
+	$(top_srcdir)/bindings/java/PLStreamc.java \
+	$(top_srcdir)/bindings/java/PLplot.java \
 	config.java \
-	PLStreamc.java \
-	PLplot.java \
 	$(swigjavafiles)
 
 # Note : the order of these is important since there is no formal 
@@ -64,7 +65,7 @@
 	plplotjavac.i \
 	$(swiggenfiles)
 
-$(swiggenfiles): plplotjavac.i $(PLPLOTCAPI_I)
+$(swiggenfiles): $(PLPLOTJAVAC_I) plplotjavac.i
 	$(SWIG_CMD) -package plplot.core plplotjavac.i
 
 # Must have "exec" in the name.
@@ -72,7 +73,7 @@
 
 libplplot = $(top_builddir)/src/libplplot$(LIB_TAG).la
 
-AM_CPPFLAGS = $(INCLTDL) $(JAVAINCCMD)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(INCLTDL) $(JAVAINCCMD)
 
 nodist_plplotjavac_wrap_la_SOURCES  = plplotjavac_wrap.c
 
@@ -100,9 +101,9 @@
 
 noinst_DATA = jar-stamp
 
-jar-stamp: $(javaclasses) $(javafiles) README.javaAPI
+jar-stamp: $(javaclasses) $(javafiles) $(top_srcdir)/bindings/java/README.javaAPI
 	$(mkdir_p) plplot/core
-	cp $(javafiles) README.javaAPI plplot/core
+	cp $(javafiles) $(top_srcdir)/bindings/java/README.javaAPI plplot/core
 	touch jar-stamp
 
 execjavawrapper_LTLIBRARIES = plplotjavac_wrap.la