X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=f3abe35b91635842b55f304330690587db863c2b;hb=1b4bab6db252abcc3daab11159b0e45862c10b4c;hp=cd0022d76dedce67711da5e7503ca0d670c56450;hpb=7f2ac369f7747a033f5e84d8c7fb3aa131f25537;p=libguestfs.git

diff --git a/src/Makefile.am b/src/Makefile.am
index cd0022d..f3abe35 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,8 +15,25 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-EXTRA_DIST = \
+include $(top_srcdir)/subdir-rules.mk
+
+generator_built = \
 	guestfs_protocol.x \
+	guestfs-structs.h \
+	guestfs-actions.h \
+	guestfs-internal-actions.h \
+	guestfs-actions.c \
+	guestfs-bindtests.c
+
+$(generator_built): stamp-generator
+
+BUILT_SOURCES = \
+  $(generator_built) \
+  guestfs_protocol.c \
+  guestfs_protocol.h
+
+EXTRA_DIST = \
+	$(BUILT_SOURCES) \
 	MAX_PROC_NR \
 	stamp-generator \
 	generator.ml
@@ -33,22 +50,10 @@ stamp-generator: generator.ml
 	mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs
 	cd $(top_srcdir) && ocaml -warn-error A src/generator.ml
 
-guestfs_protocol.x: stamp-generator
-
 include_HEADERS = guestfs.h guestfs-actions.h guestfs-structs.h
 
 lib_LTLIBRARIES = libguestfs.la
 
-BUILT_SOURCES = \
-  guestfs_protocol.x \
-  guestfs_protocol.c \
-  guestfs_protocol.h \
-  guestfs-structs.h \
-  guestfs-actions.h \
-  guestfs-actions.c \
-  guestfs-internal-actions.h \
-  guestfs-bindtests.c
-
 # This convenience library is solely to avoid compiler warnings
 # in its generated sources.
 libprotocol_la_SOURCES = \
@@ -57,10 +62,6 @@ libprotocol_la_SOURCES = \
 
 libprotocol_la_CFLAGS =
 
-$(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.
@@ -110,6 +111,7 @@ libguestfs_la_SOURCES = \
 	guestfs-actions.h \
 	guestfs-actions.c \
 	guestfs-bindtests.c \
+	guestfs-internal.h \
 	gettext.h
 
 # Make libguestfs include the convenience library.