search for: libsrcdir

I haven't received this yet, but read from the archive: https://www.redhat.com/archives/libguestfs/2009-November/msg00268.html The only suspicious part is the trailing ".c" on the command below: +$(libsrcdir)/guestfs_protocol.c: force + $(MAKE) -C $(libsrcdir) guestfs_protocol.c +$(libsrcdir)/guestfs_protocol.h: force + $(MAKE) -C $(libsrcdir) guestfs_protocol.c Shouldn't that be .h?

I needed to add a few patches to be able to build libguestfs 1.20.2 out of tree. Mostly srcdir/builddir issues -- I think that I had posted something for building the daemon before. As mentioned on IRC, I found that compiling (Ruby bindings) caused config.h file shipped with the Ruby headers to be included rather than ${builddir}/config.h. This can be fixed because the relevant checks can be

...mon/Makefile.am index e23ce86..af075d7 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -42,10 +42,10 @@ noinst_LIBRARIES = libprotocol.a libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing -guestfs_protocol.c: $(libsrcdir)/guestfs_protocol.c +guestfs_protocol.c: $(srcdir)/guestfs_protocol.c rm -f $@ ln $< $@ -guestfs_protocol.h: $(libsrcdir)/guestfs_protocol.h +guestfs_protocol.h: $(srcdir)/guestfs_protocol.h rm -f $@ ln $< $@ $(libsrcdir)/guestfs_protocol.c: force -- 1.7.7

Recently we changed the daemon so it builds guestfs_protocol.o by this rule: $(libsrcdir)/guestfs_protocol.o: force $(MAKE) -C $(libsrcdir) guestfs_protocol.o guestfsd_LDADD = \ $(libsrcdir)/guestfs_protocol.o \ #... The problem with doing this when building on Windows is that the toplevel src/ directory will be configured differently from the daemon/ directory. This me...

..._SOURCES) # Tests. These are auto-generated from the test descriptions # in the generator. diff --git a/daemon/Makefile.am b/daemon/Makefile.am index d049da6..a2e6a29 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -19,6 +19,25 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = lib tests . +libsrcdir = $(top_builddir)/../src + +GENERATOR_ML = \ + actions.h \ + stubs.c \ + names.c + +.PHONY: force + +$(GENERATOR_ML): force + $(MAKE) -C $(libsrcdir) stamp-generator + +BUILT_SOURCES = $(GENERATOR_ML) + +EXTRA_DIST = $(BUILT_SOURCES) + +$(libsrcdir)/guestfs_protocol.o: force + $(MAKE) -C $(libsrcdi...

For convenience you can pull it from the 'build' branch in: git://heisenbug.com/matthew/libguestfs.git Matt

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.

[PATCH 1/7] mount: Add mount_vfs_nochroot This is significantly reworked from before. umount is gone as discussed, and variable motion is minimised. [PATCH 2/7] btrfs: Update btrfs_subvolume_list to take Already provisionally ACKed. Previous comment was that cleanup could be tidier. I looked into creating a new cleanup function for fs_buf, but it isn't possible (or simple, anyway) in this

This type is initially identical to Device. --- generator/bindtests.ml | 2 +- generator/c.ml | 7 +++++-- generator/csharp.ml | 6 ++++-- generator/daemon.ml | 4 ++-- generator/erlang.ml | 6 +++--- generator/fish.ml | 8 ++++---- generator/gobject.ml | 11 ++++++----- generator/haskell.ml | 11 +++++++---- generator/java.ml | 10 +++++-----