X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=java%2FMakefile.am;h=6f2af11532344f743ced5c70c285b6e71a15b7ec;hb=36d8bbb8586bbe571739a79de071edd392001963;hp=1352394b032ed96548bfe9e4c3701f3190611dee;hpb=f67babb7567f2012d299c59bdddc1b2f3dde5b11;p=libguestfs.git

diff --git a/java/Makefile.am b/java/Makefile.am
index 1352394..6f2af11 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,8 +40,8 @@ java_sources = \
 java_tests = \
 	Bindtests.java \
 	t/GuestFS005Load.java \
-	t/GuestFS010Launch.java \
-	t/GuestFS050LVCreate.java
+	t/GuestFS010Basic.java \
+	t/GuestFS080OptArgs.java
 
 EXTRA_DIST = \
 	$(java_sources) \
@@ -64,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
 
@@ -93,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)