Fix for non-srcdir builds: more misc fixes.

[libguestfs.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 292e2ec..c6006d2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@
 
 EXTRA_DIST = \
        guestfs_protocol.x \
-       guestfs_protocol.c \
-       guestfs_protocol.h \
        MAX_PROC_NR \
        stamp-generator \
        generator.ml
@@ -30,10 +28,10 @@ EXTRA_DIST = \
 noinst_DATA = stamp-generator
 
 stamp-generator: generator.ml
-       mkdir -p $(top_builddir)/perl/lib/Sys
-       mkdir -p $(top_builddir)/ruby/ext/guestfs
-       mkdir -p $(top_builddir)/java/com/redhat/et/libguestfs
-       cd $(top_builddir) && ocaml -warn-error A ./src/$<
+       mkdir -p $(top_srcdir)/perl/lib/Sys
+       mkdir -p $(top_srcdir)/ruby/ext/guestfs
+       mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs
+       cd $(top_srcdir) && ocaml -warn-error A src/generator.ml
 
 guestfs_protocol.x: stamp-generator
 
@@ -52,6 +50,8 @@ BUILT_SOURCES = \
 
 $(BUILT_SOURCES): stamp-generator
 
+CLEANFILES = guestfs_protocol.c guestfs_protocol.h
+
 # From the libtool info file, with comments:
 #
 # |  1. Start with version information of `0:0:0' for each libtool library.
@@ -109,9 +109,11 @@ libguestfs_la_CFLAGS = -Wall -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
 
 if HAVE_RPCGEN
 guestfs_protocol.c: guestfs_protocol.x
-       rm -f $@-t
+       rm -f $@-t $@-t2
        $(RPCGEN) -c -o $@-t $<
-       mv $@-t $@
+       sed 's,\.\./\.\./src/,,' < $@-t > $@-t2
+       rm $@-t
+       mv $@-t2 $@
 
 guestfs_protocol.h: guestfs_protocol.x
        rm -f $@-t