bengen at hilluzination.de
2011-Nov-15 20:28 UTC
[Libguestfs] [PATCH 1/3] out of tree build: erlang
From: Hilko Bengen <bengen at hilluzination.de> --- erlang/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/erlang/Makefile.am b/erlang/Makefile.am index f336375..2c9e359 100644 --- a/erlang/Makefile.am +++ b/erlang/Makefile.am @@ -32,7 +32,7 @@ erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin erlang_bin_DATA = guestfs.beam guestfs.beam: guestfs.erl - $(ERLC) +debug_info guestfs.erl + $(ERLC) +debug_info $^ bin_PROGRAMS = erl-guestfs -- 1.7.7.2
bengen at hilluzination.de
2011-Nov-15 20:28 UTC
[Libguestfs] [PATCH 2/3] java: out-of-tree build, don't build static library
From: Hilko Bengen <bengen at hilluzination.de> --- java/Makefile.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/Makefile.am b/java/Makefile.am index 7686047..4bf7e38 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -19,7 +19,6 @@ 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: @@ -73,7 +72,7 @@ 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_LDFLAGS = -version-info $(JNI_VERSION_INFO) -shared libguestfs_jni_la_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ -I$(top_srcdir)/src -I$(top_builddir)/src \ @@ -112,10 +111,11 @@ TESTS_ENVIRONMENT = \ 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 -- 1.7.7.2
bengen at hilluzination.de
2011-Nov-15 20:28 UTC
[Libguestfs] [PATCH 3/3] out of tree build: haskell
From: Hilko Bengen <bengen at hilluzination.de> --- haskell/Makefile.am | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/haskell/Makefile.am b/haskell/Makefile.am index 1fa8c0b..5c1ff98 100644 --- a/haskell/Makefile.am +++ b/haskell/Makefile.am @@ -37,23 +37,23 @@ TESTS = run-bindtests Guestfs005Load Guestfs010Basic check_DATA = Bindtests -GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs +GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -i$(srcdir) all_targets = Bindtests Guestfs005Load Guestfs010Basic $(all_targets): $(top_builddir)/src/libguestfs.la all: $(all_targets) -Guestfs.o: Guestfs.hs - $(GHC) $(GHCFLAGS) -c $< +Guestfs.o: $(srcdir)/Guestfs.hs + $(GHC) $(GHCFLAGS) -c $< -o $@ -Bindtests: Bindtests.hs Guestfs.o +Bindtests: $(srcdir)/Bindtests.hs Guestfs.o $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs -Guestfs005Load: Guestfs005Load.hs Guestfs.o +Guestfs005Load: $(srcdir)/Guestfs005Load.hs Guestfs.o $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs -Guestfs010Basic: Guestfs010Basic.hs Guestfs.o +Guestfs010Basic: $(srcdir)/Guestfs010Basic.hs Guestfs.o $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs CLEANFILES = $(all_targets) *~ *.hi *.o -- 1.7.7.2
Richard W.M. Jones
2011-Nov-16 12:40 UTC
[Libguestfs] [PATCH 1/3] out of tree build: erlang
On Tue, Nov 15, 2011 at 09:28:20PM +0100, bengen at hilluzination.de wrote:> From: Hilko Bengen <bengen at hilluzination.de> > > --- > erlang/Makefile.am | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/erlang/Makefile.am b/erlang/Makefile.am > index f336375..2c9e359 100644 > --- a/erlang/Makefile.am > +++ b/erlang/Makefile.am > @@ -32,7 +32,7 @@ erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin > erlang_bin_DATA = guestfs.beam > > guestfs.beam: guestfs.erl > - $(ERLC) +debug_info guestfs.erl > + $(ERLC) +debug_info $^ > > bin_PROGRAMS = erl-guestfsThanks, I have applied and pushed all 3 patches. I modified the second patch so that it didn't remove the empty line after the builddir decl, but it's functionally the same. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora