git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ddb3fac
)
java: out-of-tree build, don't build static library
author
Hilko Bengen
<bengen@hilluzination.de>
Tue, 15 Nov 2011 20:28:21 +0000
(21:28 +0100)
committer
Richard W.M. Jones
<rjones@redhat.com>
Wed, 16 Nov 2011 12:38:59 +0000
(12:38 +0000)
java/Makefile.am
patch
|
blob
|
history
diff --git
a/java/Makefile.am
b/java/Makefile.am
index
7686047
..
a96d304
100644
(file)
--- 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
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 \
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
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
Bindtests.class: Bindtests.java
- $(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
+ $(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar
-d $(builddir)
$<
endif
endif