From a0509ff0715533e341573e24f6888fd7dcf4ba51 Mon Sep 17 00:00:00 2001 From: Hilko Bengen Date: Tue, 15 Nov 2011 21:28:21 +0100 Subject: [PATCH 1/1] java: out-of-tree build, don't build static library --- java/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/Makefile.am b/java/Makefile.am index 7686047..a96d304 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 -- 1.8.3.1