X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2FMakefile.am;h=c4a30bcd622f46a95759c08c37f6c37e07fc4a83;hb=8bc6e9d6a89672bbe1e7469774abe889354deb67;hp=3fe8c8827b0466926ebac04c492e5684d8be4d35;hpb=d029fa69db88e216faeedad6ebe0ca337a76fa6e;p=libguestfs.git

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 3fe8c88..c4a30bc 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs-daemon
-# Copyright (C) 2010 Red Hat Inc.
+# Copyright (C) 2011 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
@@ -13,26 +13,17 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-ACLOCAL_AMFLAGS = -I m4
+include $(top_srcdir)/subdir-rules.mk
 
-SUBDIRS = lib tests .
-
-libsrcdir = $(top_builddir)/../src
-generatorsrcdir = $(top_builddir)/../generator
+libsrcdir = $(top_builddir)/src
 
 generator_built = \
 	actions.h \
 	stubs.c \
 	names.c
 
-.PHONY: force
-
-$(generator_built): $(generatorsrcdir)/stamp-generator
-$(generatorsrcdir)/stamp-generator: force
-	$(MAKE) -C $(generatorsrcdir) stamp-generator
-
 BUILT_SOURCES = \
 	$(generator_built) \
 	guestfs_protocol.c \
@@ -42,8 +33,7 @@ BUILT_SOURCES = \
 	errnostring.c \
 	errnostring.h
 
-EXTRA_DIST = $(BUILT_SOURCES) \
-	.gitignore
+EXTRA_DIST = $(BUILT_SOURCES)
 
 noinst_LIBRARIES = libprotocol.a
 
@@ -104,6 +94,8 @@ guestfsd_SOURCES = \
 	checksum.c \
 	cmp.c \
 	command.c \
+	compress.c \
+	copy.c \
 	cpmv.c \
 	daemon.h \
 	dd.c \
@@ -137,6 +129,7 @@ guestfsd_SOURCES = \
 	luks.c \
 	lvm.c \
 	lvm-filter.c \
+	md.c \
 	mkfs.c \
 	mknod.c \
 	modprobe.c \
@@ -172,7 +165,9 @@ guestfsd_SOURCES = \
 guestfsd_LDADD = \
 	liberrnostring.a \
 	libprotocol.a \
-	lib/libgnu.a \
+	$(SELINUX_LIB) \
+	$(AUGEAS_LIB) \
+	$(top_builddir)/gnulib/lib/.libs/libgnu.a \
 	$(GETADDRINFO_LIB) \
 	$(HOSTENT_LIB) \
 	$(INET_NTOP_LIB) \
@@ -181,5 +176,7 @@ guestfsd_LDADD = \
 	$(LIBINTL) \
 	$(SERVENT_LIB)
 
-AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
+guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
 guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+
+.PHONY: force