X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=java%2FMakefile.am;h=633ecdad1670e2fa5a1a4053a9913d54d2c3a777;hp=85cb372b8f3ed71db5caa813adcf3e53098c3e7a;hb=d1a1ab972bb22f4c38a21fcc73f81650aaa03b4e;hpb=231b2cf3c76b0613ac580901919b33db2ec6791d

diff --git a/java/Makefile.am b/java/Makefile.am
index 85cb372..633ecda 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -28,6 +28,7 @@ java_sources = \
 	$(CPTH)/GuestFS.java
 
 java_tests = \
+	Bindtests.java \
 	t/GuestFS005Load.java \
 	t/GuestFS010Launch.java \
 	t/GuestFS050LVCreate.java
@@ -35,9 +36,10 @@ java_tests = \
 EXTRA_DIST = \
 	$(java_sources) \
 	$(java_tests) \
-	run-java-test
+	run-bindtests \
+	run-java-tests
 
-CLEANFILES = *~ doc-stamp
+CLEANFILES = doc-stamp
 
 if HAVE_JAVA
 
@@ -80,16 +82,28 @@ doc-stamp: $(java_sources)
 	  com.redhat.et.libguestfs
 	touch $@
 
+install-data-hook:
+	mkdir -p $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME)-java-$(PACKAGE_VERSION)
+	cp -a api/* $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME)-java-$(PACKAGE_VERSION)
+
 # Tests (not comprehensive).
 
-TESTS = $(java_tests:.java=.class)
+TESTS = run-bindtests run-java-tests
 TESTS_ENVIRONMENT = \
 	JAVA=$(JAVA) \
-	CLASSPATH=t:libguestfs-$(VERSION).jar \
-	LIBGUESTFS_PATH=$(abs_top_builddir) \
-	./run-java-test
+	CLASSPATH=.:t:libguestfs-$(VERSION).jar \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance
+
+noinst_DATA = Bindtests.class $(java_tests:.java=.class)
 
 t/%.class: t/%.java
 	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
 
-endif
\ No newline at end of file
+Bindtests.class: Bindtests.java
+	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
+
+endif
+
+# Tell version 3.79 and up of GNU make to not build goals in this
+# directory in parallel.
+.NOTPARALLEL: