X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2FMakefile.am;h=75867cbe036ebe608c5825309657a0267d13131b;hb=b3035e8d7c04a71d9a54ab7e52bc9e169ecf0b47;hp=d049da6de4637a85f7a49133605ac5e145026779;hpb=540c85a1102c5876265502f8ae287ea697834d20;p=libguestfs.git

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index d049da6..75867cb 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -19,9 +19,30 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = lib tests .
 
+libsrcdir = $(top_builddir)/../src
+
+generator_built = \
+	actions.h \
+	stubs.c \
+	names.c
+
+.PHONY: force
+
+$(generator_build): $(libsrcdir)/stamp-generator
+$(libsrcdir)/stamp-generator: 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 \
+	available.c \
 	augeas.c \
 	blkid.c \
 	blockdev.c \
@@ -30,6 +51,7 @@ guestfsd_SOURCES = \
 	command.c \
 	cpmv.c \
 	daemon.h \
+	dd.c \
 	debug.c \
 	devsparts.c \
 	df.c \
@@ -61,6 +83,8 @@ guestfsd_SOURCES = \
 	mount.c \
 	names.c \
 	ntfs.c \
+	optgroups.c \
+	optgroups.h \
 	parted.c \
 	pingdaemon.c \
 	proto.c \
@@ -83,11 +107,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