summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorHilko Bengen <bengen@hilluzination.de>2011-11-15 21:28:21 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-11-22 14:44:53 +0000
commitc7337ead3ef6264d668c34c38583c2e7e3d366da (patch)
tree25a2941a85446b9a946617ac4c541658801a4afa /java
parentbeadb1fee492a4164068e6006fab3e2599f9218e (diff)
downloadlibguestfs-c7337ead3ef6264d668c34c38583c2e7e3d366da.tar.gz
libguestfs-c7337ead3ef6264d668c34c38583c2e7e3d366da.tar.xz
libguestfs-c7337ead3ef6264d668c34c38583c2e7e3d366da.zip
java: out-of-tree build, don't build static library
(cherry picked from commit a0509ff0715533e341573e24f6888fd7dcf4ba51)
Diffstat (limited to 'java')
-rw-r--r--java/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/Makefile.am b/java/Makefile.am
index 7686047d..a96d3047 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -73,7 +73,7 @@ libguestfs_jni_la_SOURCES = \
com_redhat_et_libguestfs_GuestFS.c
libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
-libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO)
+libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO) -shared
libguestfs_jni_la_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
-I$(top_srcdir)/src -I$(top_builddir)/src \
@@ -112,10 +112,11 @@ TESTS_ENVIRONMENT = \
noinst_DATA = Bindtests.class $(java_tests:.java=.class)
t/%.class: t/%.java
- $(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
+ mkdir -p t
+ $(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d $(builddir)/t $<
Bindtests.class: Bindtests.java
- $(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
+ $(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d $(builddir) $<
endif