git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
java
/
Makefile.am
diff --git
a/java/Makefile.am
b/java/Makefile.am
index
1352394
..
0755cbf
100644
(file)
--- a/
java/Makefile.am
+++ b/
java/Makefile.am
@@
-15,13
+15,23
@@
# 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.
+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,7
@@
java_sources = \
java_tests = \
Bindtests.java \
t/GuestFS005Load.java \
java_tests = \
Bindtests.java \
t/GuestFS005Load.java \
- t/GuestFS010Launch.java \
- t/GuestFS050LVCreate.java
+ t/GuestFS010Basic.java
EXTRA_DIST = \
$(java_sources) \
EXTRA_DIST = \
$(java_sources) \
@@
-93,7
+102,8
@@
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)
noinst_DATA = Bindtests.class $(java_tests:.java=.class)