git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generated code for 'add_drive_ro' call.
[libguestfs.git]
/
java
/
Makefile.am
diff --git
a/java/Makefile.am
b/java/Makefile.am
index
85cb372
..
633ecda
100644
(file)
--- a/
java/Makefile.am
+++ b/
java/Makefile.am
@@
-28,6
+28,7
@@
java_sources = \
$(CPTH)/GuestFS.java
java_tests = \
$(CPTH)/GuestFS.java
java_tests = \
+ Bindtests.java \
t/GuestFS005Load.java \
t/GuestFS010Launch.java \
t/GuestFS050LVCreate.java
t/GuestFS005Load.java \
t/GuestFS010Launch.java \
t/GuestFS050LVCreate.java
@@
-35,9
+36,10
@@
java_tests = \
EXTRA_DIST = \
$(java_sources) \
$(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
if HAVE_JAVA
@@
-80,16
+82,28
@@
doc-stamp: $(java_sources)
com.redhat.et.libguestfs
touch $@
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 (not comprehensive).
-TESTS =
$(java_tests:.java=.class)
+TESTS =
run-bindtests run-java-tests
TESTS_ENVIRONMENT = \
JAVA=$(JAVA) \
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 $<
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: