X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2FMakefile.am;h=2e33c1a7edc3419b79e4619ae1a2a94e66d1aad9;hp=2774ffcd76fa7bd80913523365e6104c43974236;hb=ab100792a1fe13c3e8cc180c94a52c91f0493358;hpb=44097b509c8fa665f8391e393025599a026cddac

diff --git a/src/Makefile.am b/src/Makefile.am
index 2774ffc..2e33c1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,12 +15,28 @@
 # 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 \
-	guestfs-internal-actions.h
+	generator.ml
 
 # Rerun the generator if it has changed.
 # Git removes empty directories, so in cases where the
@@ -34,21 +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
 
-$(BUILT_SOURCES): 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-bindtests.c
-
 # This convenience library is solely to avoid compiler warnings
 # in its generated sources.
 libprotocol_la_SOURCES = \
@@ -57,8 +62,6 @@ libprotocol_la_SOURCES = \
 
 libprotocol_la_CFLAGS =
 
-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,11 +112,14 @@ libguestfs_la_SOURCES = \
 	guestfs-actions.c \
 	guestfs-bindtests.c \
 	guestfs-internal.h \
+	guestfs_protocol.h \
 	gettext.h
 
+libguestfs_la_LIBADD = $(LTLIBTHREAD)
+
 # Make libguestfs include the convenience library.
 noinst_LTLIBRARIES = libprotocol.la
-libguestfs_la_LIBADD = libprotocol.la
+libguestfs_la_LIBADD += libprotocol.la
 
 libguestfs_la_CFLAGS = \
   -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \