X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2FMakefile.am;h=1664af04638e47bddc6bc7b0b19b75eae07fee60;hb=b3f1457fddd19b1e540866fa01c665aeb371cb44;hp=78049c9f4fa3f096e7fa096628bd0c4f16b1adbf;hpb=5f10c3350338bbca735a74db26f98da968957bd9;p=libguestfs.git

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 78049c9..1664af0 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
@@ -15,24 +15,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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
 
@@ -86,7 +76,12 @@ errnostring.h: $(libsrcdir)/errnostring.h
 	rm -f $@
 	ln $< $@
 
+if INSTALL_DAEMON
+sbin_PROGRAMS = guestfsd
+else
 noinst_PROGRAMS = guestfsd
+endif
+
 guestfsd_SOURCES = \
 	9p.c \
 	actions.h \
@@ -95,6 +90,7 @@ guestfsd_SOURCES = \
 	base64.c \
 	blkid.c \
 	blockdev.c \
+	btrfs.c \
 	checksum.c \
 	cmp.c \
 	command.c \
@@ -166,7 +162,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) \
@@ -175,5 +173,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