X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=java%2FMakefile.am;h=0755cbf793672e4f1a2bc47f90871f15f3ec54d8;hb=5248114edea548d142d7c7ce644cea22f7957822;hp=51cd3b58a04a79e3670807f1882525e8bfff8abc;hpb=96fdcf7f2ed0c0d32cf14b5fea95cfba94f2c977;p=libguestfs.git

diff --git a/java/Makefile.am b/java/Makefile.am
index 51cd3b5..0755cbf 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -15,13 +15,23 @@
 # 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 $(builddir)/Makefile.inc
+include $(srcdir)/Makefile.inc
 
 java_sources = \
 	$(java_built_sources) \
@@ -30,14 +40,14 @@ java_sources = \
 java_tests = \
 	Bindtests.java \
 	t/GuestFS005Load.java \
-	t/GuestFS010Launch.java \
-	t/GuestFS050LVCreate.java
+	t/GuestFS010Basic.java
 
 EXTRA_DIST = \
 	$(java_sources) \
 	$(java_tests) \
 	run-bindtests \
-	run-java-tests
+	run-java-tests \
+	Makefile.inc
 
 CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_et_libguestfs_GuestFS.h *.class *.jar api/com/redhat/et/libguestfs/*.html api/*
 
@@ -92,7 +102,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)