X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2FMakefile.am;h=dc5813419135ef229da85e4544bc221ebe457598;hp=1716c2f57450da535665f4a74270e2abd71ff67a;hb=3a99114360636806078bbf614c241e89661bcc7f;hpb=c477e2fb78347728aaacbbc89666dcda1481a4b9

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 1716c2f..dc58134 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -28,20 +28,43 @@ generator_built = \
 
 .PHONY: force
 
-$(generator_built): force
+$(generator_built): $(libsrcdir)/stamp-generator
+$(libsrcdir)/stamp-generator: force
 	$(MAKE) -C $(libsrcdir) stamp-generator
 
-BUILT_SOURCES = $(generator_built)
+BUILT_SOURCES = \
+	$(generator_built) \
+	guestfs_protocol.c \
+	guestfs_protocol.h
 
-EXTRA_DIST = $(BUILT_SOURCES)
+EXTRA_DIST = $(BUILT_SOURCES) \
+	.gitignore
 
-$(libsrcdir)/guestfs_protocol.o: force
-	$(MAKE) -C $(libsrcdir) guestfs_protocol.o
+# 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 \
@@ -49,6 +72,7 @@ guestfsd_SOURCES = \
 	command.c \
 	cpmv.c \
 	daemon.h \
+	dd.c \
 	debug.c \
 	devsparts.c \
 	df.c \
@@ -60,6 +84,7 @@ guestfsd_SOURCES = \
 	ext2.c \
 	fallocate.c \
 	file.c \
+	findfs.c \
 	fill.c \
 	find.c \
 	fsck.c \
@@ -69,17 +94,23 @@ guestfsd_SOURCES = \
 	guestfsd.c \
 	headtail.c \
 	hexdump.c \
+	htonl.c \
 	initrd.c \
 	inotify.c \
+	is.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 \
@@ -90,6 +121,7 @@ guestfsd_SOURCES = \
 	sfdisk.c \
 	sleep.c \
 	stat.c \
+	statvfs.c \
 	strings.c \
 	stubs.c \
 	swap.c \
@@ -103,7 +135,16 @@ guestfsd_SOURCES = \
 	xattr.c \
 	zero.c \
 	zerofree.c
-guestfsd_LDADD = $(libsrcdir)/guestfs_protocol.o lib/libgnu.a
+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 = $(WARN_CFLAGS) $(WERROR_CFLAGS)