git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.0.63
[libguestfs.git]
/
java
/
Makefile.am
diff --git
a/java/Makefile.am
b/java/Makefile.am
index
d1c0da4
..
6ddf8b4
100644
(file)
--- a/
java/Makefile.am
+++ b/
java/Makefile.am
@@
-15,19
+15,20
@@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-CPTH = com/redhat/et/libguestfs
+# Old RHEL 5 autoconf doesn't have builddir.
+builddir ?= $(top_builddir)/java
+
+java_prefix = com/redhat/et/libguestfs
+
+# Pull in automatically generated built sources
+include $(srcdir)/Makefile.inc
java_sources = \
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
+ $(java_built_sources) \
+ com/redhat/et/libguestfs/LibGuestFSException.java
java_tests = \
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,11
@@
java_tests = \
EXTRA_DIST = \
$(java_sources) \
$(java_tests) \
EXTRA_DIST = \
$(java_sources) \
$(java_tests) \
- run-java-test
+ run-bindtests \
+ run-java-tests \
+ Makefile.inc
-CLEANFILES = doc-stamp
+CLEANFILES = doc-stamp
$(builddir)/com/redhat/et/libguestfs/*.class com_redhat_et_libguestfs_GuestFS.h *.class *.jar api/com/redhat/et/libguestfs/*.html api/*
if HAVE_JAVA
if HAVE_JAVA
@@
-47,7
+50,7
@@
libguestfs_jardir = $(JAR_INSTALL_DIR)
libguestfs_jar_DATA = libguestfs-${VERSION}.jar
libguestfs_jar_class_files = $(java_sources:.java=.class)
$(libguestfs_jar_class_files): %.class: %.java
libguestfs_jar_DATA = libguestfs-${VERSION}.jar
libguestfs_jar_class_files = $(java_sources:.java=.class)
$(libguestfs_jar_class_files): %.class: %.java
- $(JAVAC) $(JAVAC_FLAGS) -
classpath $(CPTH) $(java_sources)
+ $(JAVAC) $(JAVAC_FLAGS) -
d $(builddir) -classpath @srcdir@:$(builddir) -sourcepath @srcdir@:$(builddir) $<
libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
$(JAR) cf $@ $^
libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
$(JAR) cf $@ $^
@@
-61,12
+64,12
@@
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_LIBADD = $(top_builddir)/src/libguestfs.la
libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO)
-libguestfs_jni_la_CFLAGS = -Wall -I$(top_builddir)/src $(JNI_CFLAGS)
+libguestfs_jni_la_CFLAGS = -Wall -I$(top_
srcdir)/src -I$(top_
builddir)/src $(JNI_CFLAGS)
BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
-com_redhat_et_libguestfs_GuestFS.h: $(
CPTH
)/GuestFS.class
- $(JAVAH) -classpath
.:$(CPTH
) com.redhat.et.libguestfs.GuestFS
+com_redhat_et_libguestfs_GuestFS.h: $(
java_prefix
)/GuestFS.class
+ $(JAVAH) -classpath
@srcdir@:$(builddir
) com.redhat.et.libguestfs.GuestFS
# Documentation.
# Documentation.
@@
-86,14
+89,22
@@
install-data-hook:
# 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: