From: Rafael L. <rla...@us...> - 2004-07-13 12:10:11
|
Update of /cvsroot/plplot/plplot/bindings/java In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24953/bindings/java Modified Files: .cvsignore Makefile.am Log Message: Improvements of the Java bindings configuration/build scheme. (1) In cf/java.ac, there are two new AC_SUBSTituted variables JAVAC and JAR, used in {bindings,examples}/java/Makefile.am as the java and jar commands, respectively. The availability of the commands are checked by the configure script. (2) Portability fix: changed the GNUish pattern rule for building *.class files from *.java. An implicit rule (.java.class) is used now. Since the javac command creates class files in a directory tree , it is necessary now to copy the generated file to the current directory. This is why the *.class files have been added to CLEANFILES. (3) The plplot.jar file is created in examples/java/Makefile.am using the make machinery. This means that plplot.jar correctly depends on the *.class files now. Since this must be done across directories (the plplot.core.* classes are elsewhere), a jar-stamp file is created in bindings/java/Makefile.am, which depends on the plplot/core/*.class files. Installation of the plplot.jar is now controlled by Autmake, instead of using the install-hook method as before. (4) The .cvsignore files have been accordingly tweaked. Index: .cvsignore =================================================================== RCS file: /cvsroot/plplot/plplot/bindings/java/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- .cvsignore 29 Jun 2004 14:51:15 -0000 1.6 +++ .cvsignore 13 Jul 2004 12:10:01 -0000 1.7 @@ -13,5 +13,6 @@ plplotjavac_wrap.c plplotjavacConstants.java plplot -plplot.jar classnoinst.stamp +*.class +jar-stamp Index: Makefile.am =================================================================== RCS file: /cvsroot/plplot/plplot/bindings/java/Makefile.am,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- Makefile.am 7 Jul 2004 08:27:51 -0000 1.36 +++ Makefile.am 13 Jul 2004 12:10:01 -0000 1.37 @@ -20,8 +20,6 @@ # along with the file; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -JAVAC = javac - SWIG_SUPPORT_DIR = $(top_srcdir)/bindings/swig-support PLPLOTCAPI_I = $(SWIG_SUPPORT_DIR)/plplotcapi.i @@ -48,13 +46,13 @@ # Note : the order of these is important since there is no formal # dependency checking. javaclasses = \ - plplot/core/config.class \ - plplot/core/PLStreamc.class \ - plplot/core/plplotjavacJNI.class \ - plplot/core/SWIGTYPE_p_p_char.class\ - plplot/core/plplotjavacConstants.class \ - plplot/core/plplotjavac.class \ - plplot/core/PLplot.class + config.class \ + PLStreamc.class \ + plplotjavacJNI.class \ + SWIGTYPE_p_p_char.class\ + plplotjavacConstants.class \ + plplotjavac.class \ + PLplot.class ### FIXME: Brute force inclusion in dist tarball. The files below may ### be treated in a different way for installation [RL, 2003-03-06] @@ -97,8 +95,15 @@ # Can't use java support for now since jikes doesn't handle dependencies # properly - instead do it using DATA and with an explicit rule. #noinst_JAVA = $(javafiles) -#plplotjavadir = $(DATA_DIR)/java/ -#plplotjava_DATA = plplot.jar + +.java.class: + $(JAVAC) $(AM_JAVACFLAGS) $(JAVACFLAGS) $< -d . -classpath . + cp plplot/core/$@ . + +noinst_DATA = jar-stamp + +jar-stamp: $(javaclasses) + touch jar-stamp ourexecjava_DATA = $(javafiles) $(javaclasses) README.javaAPI @@ -107,10 +112,9 @@ # if enable_java endif -plplot/core/%.class : %.java - $(JAVAC) $(AM_JAVACFLAGS) $(JAVACFLAGS) $< -d . -classpath . - clean-local: rm -rf plplot +CLEANFILES = $(javaclasses) jar-stamp + MAINTAINERCLEANFILES = $(swiggenfiles) |