X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2FMakefile.am;h=0c8be08e2bdb7db5ef9e7ea63950d4d897730499;hp=43cc752717aa143b70487f4c9f7d306d0565391c;hb=88ab203e611694bc0d01aca745e8df18cb3f094e;hpb=e05ddc70f1fa6d1e8253d69c5d17e69bfad2be90

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 43cc752..0c8be08 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -19,16 +19,60 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = lib tests .
 
+libsrcdir = $(top_builddir)/../src
+
+generator_built = \
+	actions.h \
+	stubs.c \
+	names.c
+
+.PHONY: force
+
+$(generator_built): $(libsrcdir)/stamp-generator
+$(libsrcdir)/stamp-generator: force
+	$(MAKE) -C $(libsrcdir) stamp-generator
+
+BUILT_SOURCES = \
+	$(generator_built) \
+	guestfs_protocol.c \
+	guestfs_protocol.h
+
+EXTRA_DIST = $(BUILT_SOURCES) \
+	.gitignore
+
+# This convenience library is solely to avoid compiler warnings
+# in its generated sources.
+noinst_LIBRARIES = libprotocol.a
+libprotocol_a_SOURCES = \
+	guestfs_protocol.c \
+	guestfs_protocol.h
+libprotocol_a_CFLAGS =
+
+guestfs_protocol.c: $(libsrcdir)/guestfs_protocol.c
+	rm -f $@
+	ln $< $@
+guestfs_protocol.h: $(libsrcdir)/guestfs_protocol.h
+	rm -f $@
+	ln $< $@
+$(libsrcdir)/guestfs_protocol.c: force
+	$(MAKE) -C $(libsrcdir) guestfs_protocol.c
+$(libsrcdir)/guestfs_protocol.h: force
+	$(MAKE) -C $(libsrcdir) guestfs_protocol.h
+
 noinst_PROGRAMS = guestfsd
 guestfsd_SOURCES = \
 	actions.h \
+	available.c \
 	augeas.c \
+	base64.c \
+	blkid.c \
 	blockdev.c \
 	checksum.c \
 	cmp.c \
 	command.c \
 	cpmv.c \
 	daemon.h \
+	dd.c \
 	debug.c \
 	devsparts.c \
 	df.c \
@@ -36,9 +80,12 @@ guestfsd_SOURCES = \
 	dmesg.c \
 	dropcaches.c \
 	du.c \
+	echo_daemon.c \
 	ext2.c \
 	fallocate.c \
 	file.c \
+	findfs.c \
+	fill.c \
 	find.c \
 	fsck.c \
 	glob.c \
@@ -47,37 +94,56 @@ guestfsd_SOURCES = \
 	guestfsd.c \
 	headtail.c \
 	hexdump.c \
+	htonl.c \
 	initrd.c \
 	inotify.c \
 	link.c \
 	ls.c \
+	luks.c \
 	lvm.c \
+	lvm-filter.c \
+	mkfs.c \
 	mknod.c \
+	modprobe.c \
 	mount.c \
 	names.c \
 	ntfs.c \
+	optgroups.c \
+	optgroups.h \
+	parted.c \
 	pingdaemon.c \
 	proto.c \
 	readdir.c \
 	realpath.c \
 	scrub.c \
+	selinux.c \
 	sfdisk.c \
 	sleep.c \
 	stat.c \
+	statvfs.c \
 	strings.c \
 	stubs.c \
 	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 = \
+	libprotocol.a \
+	lib/libgnu.a \
+	$(GETADDRINFO_LIB) \
+	$(HOSTENT_LIB) \
+	$(INET_NTOP_LIB) \
+	$(LIBSOCKET) \
+	$(LIB_CLOCK_GETTIME) \
+	$(LIBINTL) \
+	$(SERVENT_LIB)
 
 AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
-guestfsd_CFLAGS = -Wall
-LDADD = lib/libgnu.a
+guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)