X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=java%2FMakefile.am;h=6f2af11532344f743ced5c70c285b6e71a15b7ec;hb=e59e35708b4ad66c99f908c5226cb232931e1791;hp=f0db49354c28b36dcf7fc0343e32f032799dc8ff;hpb=11400fde901e1c7a6d3c3887f322af66374793c2;p=libguestfs.git

diff --git a/java/Makefile.am b/java/Makefile.am
index f0db493..6f2af11 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -15,35 +15,42 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 # Old RHEL 5 autoconf doesn't have builddir.
 builddir ?= $(top_builddir)/java
 
+# XXX: Need to fix generator.ml dependencies
+#
+# Files generated by generator.ml:
+#   Makefile.inc
+#   All files listed in Makefile.inc
+#   com_redhat_et_libguestfs_GuestFS.c
+#   Bindtests.java
+
 java_prefix = com/redhat/et/libguestfs
 
+# Pull in automatically generated built sources
+include $(srcdir)/Makefile.inc
+
 java_sources = \
-	$(java_prefix)/LibGuestFSException.java \
-	$(java_prefix)/IntBool.java \
-	$(java_prefix)/PV.java \
-	$(java_prefix)/VG.java \
-	$(java_prefix)/LV.java \
-	$(java_prefix)/Stat.java \
-	$(java_prefix)/StatVFS.java \
-	$(java_prefix)/Dirent.java \
-	$(java_prefix)/GuestFS.java
+	$(java_built_sources) \
+	com/redhat/et/libguestfs/LibGuestFSException.java
 
 java_tests = \
 	Bindtests.java \
 	t/GuestFS005Load.java \
-	t/GuestFS010Launch.java \
-	t/GuestFS050LVCreate.java
+	t/GuestFS010Basic.java \
+	t/GuestFS080OptArgs.java
 
 EXTRA_DIST = \
 	$(java_sources) \
 	$(java_tests) \
 	run-bindtests \
-	run-java-tests
+	run-java-tests \
+	Makefile.inc
 
-CLEANFILES = doc-stamp
+CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_et_libguestfs_GuestFS.h *.class *.jar api/com/redhat/et/libguestfs/*.html api/*
 
 if HAVE_JAVA
 
@@ -67,7 +74,10 @@ libguestfs_jni_la_SOURCES = \
 
 libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
 libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO)
-libguestfs_jni_la_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_builddir)/src $(JNI_CFLAGS)
+libguestfs_jni_la_CFLAGS = \
+  $(WARN_CFLAGS) $(WERROR_CFLAGS) \
+  -I$(top_srcdir)/src -I$(top_builddir)/src \
+  $(JNI_CFLAGS)
 
 BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
 
@@ -96,7 +106,8 @@ TESTS = run-bindtests run-java-tests
 TESTS_ENVIRONMENT = \
 	JAVA=$(JAVA) \
 	CLASSPATH=.:t:libguestfs-$(VERSION).jar \
-	LIBGUESTFS_PATH=$(top_builddir)/appliance
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	TMPDIR=$(top_builddir)
 
 noinst_DATA = Bindtests.class $(java_tests:.java=.class)