search for: java_prefix

--- java/Makefile.am | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/java/Makefile.am b/java/Makefile.am index c753672..9c31e57 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -22,12 +22,6 @@ java_prefix = com/redhat/et/libguestfs # Old RHEL 5 autoconf doesn't have builddir. builddir ?= $(top_builddir)/java -generator_built = \ - Makefile.inc \ - $(java_built_sources) \ - com_redhat_et_libguestfs_GuestFS.c \ - Bindtests.java - # Pull in automatically generated built sources include $(srcd...

...JAVADOC_FLAGS = -encoding utf-8 +if !HAVE_JAVAH +JAVAC_FLAGS += -h . +endif # Java source. @@ -125,10 +128,18 @@ libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO) -shared BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h +if HAVE_JAVAH + com_redhat_et_libguestfs_GuestFS.h: $(java_prefix)/GuestFS.class rm -f $@ $(JAVAH) -classpath $(srcdir):. com.redhat.et.libguestfs.GuestFS +else + +com_redhat_et_libguestfs_GuestFS.h: libguestfs-${VERSION}.jar + +endif + # Documentation. noinst_SCRIPTS = doc-stamp diff --git a/m4/guestfs-java.m4 b/m4/guestfs-java.m4 index 9d0f948b6..2ab9...

...+18,14 @@ # 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 diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index bb7407a..4375337 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -15,12 +15,22 @@ # along with this program; if not, write to the Free Software # Founda...

This new series condenses all of the previously posted patches into new patch 1/2. The second patch is a new fix for parallel build in the haskell directory.

Patch 1/5 is a repost. Only change is title update. These fix parallel make on my machine, and additionally make building from subdirectories more correct.