git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extra-tests: Add an extra suppression for OCaml 3.11.2 in RHEL 6.
[libguestfs.git]
/
java
/
Makefile.am
diff --git
a/java/Makefile.am
b/java/Makefile.am
index
1352394
..
a96d304
100644
(file)
--- a/
java/Makefile.am
+++ b/
java/Makefile.am
@@
-13,15
+13,25
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+include $(top_srcdir)/subdir-rules.mk
# Old RHEL 5 autoconf doesn't have builddir.
builddir ?= $(top_builddir)/java
# Old RHEL 5 autoconf doesn't have builddir.
builddir ?= $(top_builddir)/java
+# XXX: Need to fix generator.ml dependencies
+#
+# Files generated by generator.ml:
+# Makefile.inc
+# All files listed in Makefile.inc
+# com_redhat_et_libguestfs_GuestFS.c
+# Bindtests.java
+
java_prefix = com/redhat/et/libguestfs
# Pull in automatically generated built sources
java_prefix = com/redhat/et/libguestfs
# Pull in automatically generated built sources
-include $(
build
dir)/Makefile.inc
+include $(
src
dir)/Makefile.inc
java_sources = \
$(java_built_sources) \
java_sources = \
$(java_built_sources) \
@@
-30,8
+40,8
@@
java_sources = \
java_tests = \
Bindtests.java \
t/GuestFS005Load.java \
java_tests = \
Bindtests.java \
t/GuestFS005Load.java \
- t/GuestFS010
Launch
.java \
- t/GuestFS0
50LVCreate
.java
+ t/GuestFS010
Basic
.java \
+ t/GuestFS0
80OptArgs
.java
EXTRA_DIST = \
$(java_sources) \
EXTRA_DIST = \
$(java_sources) \
@@
-63,8
+73,11
@@
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_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_builddir)/src $(JNI_CFLAGS)
+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 \
+ $(JNI_CFLAGS)
BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
@@
-93,15
+106,17
@@
TESTS = run-bindtests run-java-tests
TESTS_ENVIRONMENT = \
JAVA=$(JAVA) \
CLASSPATH=.:t:libguestfs-$(VERSION).jar \
TESTS_ENVIRONMENT = \
JAVA=$(JAVA) \
CLASSPATH=.:t:libguestfs-$(VERSION).jar \
- LIBGUESTFS_PATH=$(top_builddir)/appliance
+ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir)
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