X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=java%2FMakefile.am;h=ea90a4825e53ec0c95961837f1bbaf50fc150d34;hb=3b5c29f589d4637af4a6f0453975a3df13a6113d;hp=6ca6f290e261204aac1756c1c030b273c7a9a5b6;hpb=2b568496e6d571be317bcecd58785edbf5d39ba1;p=libguestfs.git

diff --git a/java/Makefile.am b/java/Makefile.am
index 6ca6f29..ea90a48 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -18,25 +18,29 @@
 CPTH = com/redhat/et/libguestfs
 
 java_sources = \
-  $(CPTH)/LibGuestFSException.java \
-  $(CPTH)/IntBool.java \
-  $(CPTH)/PV.java \
-  $(CPTH)/VG.java \
-  $(CPTH)/LV.java \
-  $(CPTH)/Stat.java \
-  $(CPTH)/StatVFS.java \
-  $(CPTH)/GuestFS.java
+	$(CPTH)/LibGuestFSException.java \
+	$(CPTH)/IntBool.java \
+	$(CPTH)/PV.java \
+	$(CPTH)/VG.java \
+	$(CPTH)/LV.java \
+	$(CPTH)/Stat.java \
+	$(CPTH)/StatVFS.java \
+	$(CPTH)/Dirent.java \
+	$(CPTH)/GuestFS.java
 
 java_tests = \
-  t/GuestFS005Load.java \
-  t/GuestFS010Launch.java
+	Bindtests.java \
+	t/GuestFS005Load.java \
+	t/GuestFS010Launch.java \
+	t/GuestFS050LVCreate.java
 
 EXTRA_DIST = \
 	$(java_sources) \
 	$(java_tests) \
-	run-java-test
+	run-bindtests \
+	run-java-tests
 
-CLEANFILES = *~ doc-stamp
+CLEANFILES = doc-stamp
 
 if HAVE_JAVA
 
@@ -79,16 +83,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: