X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2FMakefile.am;h=78049c9f4fa3f096e7fa096628bd0c4f16b1adbf;hp=cf9f7ca3b62ed2af4e80d7f033b157108c4e2da7;hb=7f16c346bbeba2f2fe3c31ccb85158178a284d84;hpb=d2cf9a15a9f22623dbbed33fb66c5077f1275df2

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index cf9f7ca..78049c9 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs-daemon
-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2010 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = lib tests .
 
 libsrcdir = $(top_builddir)/../src
+generatorsrcdir = $(top_builddir)/../generator
 
 generator_built = \
 	actions.h \
@@ -28,25 +29,28 @@ generator_built = \
 
 .PHONY: force
 
-$(generator_built): $(libsrcdir)/stamp-generator
-$(libsrcdir)/stamp-generator: force
-	$(MAKE) -C $(libsrcdir) stamp-generator
+$(generator_built): $(generatorsrcdir)/stamp-generator
+$(generatorsrcdir)/stamp-generator: force
+	$(MAKE) -C $(generatorsrcdir) stamp-generator
 
 BUILT_SOURCES = \
 	$(generator_built) \
 	guestfs_protocol.c \
-	guestfs_protocol.h
+	guestfs_protocol.h \
+	errnostring_gperf.c \
+	errnostring_gperf.gperf \
+	errnostring.c \
+	errnostring.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 =
+
+# This convenience library is solely to compile its generated sources with
+# custom flags.
+libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h
+libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
 
 guestfs_protocol.c: $(libsrcdir)/guestfs_protocol.c
 	rm -f $@
@@ -59,8 +63,32 @@ $(libsrcdir)/guestfs_protocol.c: force
 $(libsrcdir)/guestfs_protocol.h: force
 	$(MAKE) -C $(libsrcdir) guestfs_protocol.h
 
+# Build the errnostring perfect hash code.  The generated code has lots
+# of warnings so we must compile it in a separate mini-library.
+noinst_LIBRARIES += liberrnostring.a
+liberrnostring_a_SOURCES = \
+	errnostring_gperf.c \
+	errnostring.h \
+	errnostring.c
+liberrnostring_a_CFLAGS =
+
+errnostring_gperf.c: errnostring_gperf.gperf
+	rm -f $@
+	$(GPERF) -t $< > $@-t
+	mv $@-t $@
+errnostring_gperf.gperf: $(libsrcdir)/errnostring_gperf.gperf
+	rm -f $@
+	ln $< $@
+errnostring.c: $(libsrcdir)/errnostring.c
+	rm -f $@
+	ln $< $@
+errnostring.h: $(libsrcdir)/errnostring.h
+	rm -f $@
+	ln $< $@
+
 noinst_PROGRAMS = guestfsd
 guestfsd_SOURCES = \
+	9p.c \
 	actions.h \
 	available.c \
 	augeas.c \
@@ -84,6 +112,7 @@ guestfsd_SOURCES = \
 	ext2.c \
 	fallocate.c \
 	file.c \
+	findfs.c \
 	fill.c \
 	find.c \
 	fsck.c \
@@ -96,8 +125,10 @@ guestfsd_SOURCES = \
 	htonl.c \
 	initrd.c \
 	inotify.c \
+	is.c \
 	link.c \
 	ls.c \
+	luks.c \
 	lvm.c \
 	lvm-filter.c \
 	mkfs.c \
@@ -133,6 +164,7 @@ guestfsd_SOURCES = \
 	zero.c \
 	zerofree.c
 guestfsd_LDADD = \
+	liberrnostring.a \
 	libprotocol.a \
 	lib/libgnu.a \
 	$(GETADDRINFO_LIB) \