X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2FMakefile.am;h=1716c2f57450da535665f4a74270e2abd71ff67a;hb=4d35cc2ff0589e786b0194b9cfdf3aa7b01f6b29;hp=72e189664290f27c759c0eb709ddec4abd1ddcdc;hpb=b1e1ca2f74a921b3f784537d59c617df29ea1d60;p=libguestfs.git

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 72e1896..1716c2f 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_built = \
+	actions.h \
+	stubs.c \
+	names.c
+
+.PHONY: force
+
+$(generator_built): force
+	$(MAKE) -C $(libsrcdir) stamp-generator
+
+BUILT_SOURCES = $(generator_built)
+
+EXTRA_DIST = $(BUILT_SOURCES)
+
+$(libsrcdir)/guestfs_protocol.o: force
+	$(MAKE) -C $(libsrcdir) guestfs_protocol.o
+
 noinst_PROGRAMS = guestfsd
 guestfsd_SOURCES = \
 	actions.h \
@@ -41,6 +60,7 @@ guestfsd_SOURCES = \
 	ext2.c \
 	fallocate.c \
 	file.c \
+	fill.c \
 	find.c \
 	fsck.c \
 	glob.c \
@@ -82,11 +102,8 @@ guestfsd_SOURCES = \
 	wc.c \
 	xattr.c \
 	zero.c \
-	zerofree.c \
-	$(top_builddir)/../src/guestfs_protocol.h \
-	$(top_builddir)/../src/guestfs_protocol.c
+	zerofree.c
+guestfsd_LDADD = $(libsrcdir)/guestfs_protocol.o lib/libgnu.a
 
 AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
 guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-
-LDADD = lib/libgnu.a