X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=java%2FMakefile.am;h=a96d3047ec52cfd1c64e61b9fc17bb2854a5c27c;hb=41a7a68cf33a174ba950aa29951a07c391a16b4d;hp=51cd3b58a04a79e3670807f1882525e8bfff8abc;hpb=96fdcf7f2ed0c0d32cf14b5fea95cfba94f2c977;p=libguestfs.git diff --git a/java/Makefile.am b/java/Makefile.am index 51cd3b5..a96d304 100644 --- 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 -# 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 +# 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 -include $(builddir)/Makefile.inc +include $(srcdir)/Makefile.inc java_sources = \ $(java_built_sources) \ @@ -30,14 +40,15 @@ java_sources = \ java_tests = \ Bindtests.java \ t/GuestFS005Load.java \ - t/GuestFS010Launch.java \ - t/GuestFS050LVCreate.java + t/GuestFS010Basic.java \ + t/GuestFS080OptArgs.java EXTRA_DIST = \ $(java_sources) \ $(java_tests) \ run-bindtests \ - run-java-tests + run-java-tests \ + Makefile.inc CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_et_libguestfs_GuestFS.h *.class *.jar api/com/redhat/et/libguestfs/*.html api/* @@ -62,8 +73,11 @@ 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_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 @@ -92,15 +106,17 @@ TESTS = run-bindtests run-java-tests 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 - $(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