X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=daemon%2FMakefile.am;h=1716c2f57450da535665f4a74270e2abd71ff67a;hb=c477e2fb78347728aaacbbc89666dcda1481a4b9;hp=024c0970ca23ad7565f6f069ff85b44061389d2e;hpb=4610db9f1b77f8c263b348fda1974be165a7f841;p=libguestfs.git

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 024c097..1716c2f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -17,10 +17,32 @@
 
 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 \
 	augeas.c \
+	blkid.c \
 	blockdev.c \
 	checksum.c \
 	cmp.c \
@@ -34,9 +56,11 @@ guestfsd_SOURCES = \
 	dmesg.c \
 	dropcaches.c \
 	du.c \
+	echo_daemon.c \
 	ext2.c \
 	fallocate.c \
 	file.c \
+	fill.c \
 	find.c \
 	fsck.c \
 	glob.c \
@@ -50,15 +74,19 @@ guestfsd_SOURCES = \
 	link.c \
 	ls.c \
 	lvm.c \
+	mkfs.c \
 	mknod.c \
+	modprobe.c \
 	mount.c \
 	names.c \
 	ntfs.c \
+	parted.c \
 	pingdaemon.c \
 	proto.c \
 	readdir.c \
 	realpath.c \
 	scrub.c \
+	selinux.c \
 	sfdisk.c \
 	sleep.c \
 	stat.c \
@@ -67,13 +95,15 @@ guestfsd_SOURCES = \
 	swap.c \
 	sync.c \
 	tar.c \
+	truncate.c \
 	umask.c \
 	upload.c \
+	utimens.c \
 	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
 
-guestfsd_CFLAGS = -Wall
+AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
+guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)