daemon: Use pkg-config to locate Augeas CFLAGS / libraries.

[libguestfs.git] / daemon / Makefile.am

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 2fe6573..a19a157 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -13,7 +13,7 @@
 #
 # 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.
 
 include $(top_srcdir)/subdir-rules.mk
 
@@ -33,8 +33,7 @@ BUILT_SOURCES = \
        errnostring.c \
        errnostring.h
 
-EXTRA_DIST = $(BUILT_SOURCES) \
-       .gitignore
+EXTRA_DIST = $(BUILT_SOURCES)
 
 noinst_LIBRARIES = libprotocol.a
 
@@ -95,6 +94,8 @@ guestfsd_SOURCES = \
        checksum.c \
        cmp.c \
        command.c \
+       compress.c \
+       copy.c \
        cpmv.c \
        daemon.h \
        dd.c \
@@ -128,6 +129,7 @@ guestfsd_SOURCES = \
        luks.c \
        lvm.c \
        lvm-filter.c \
+       md.c \
        mkfs.c \
        mknod.c \
        modprobe.c \
@@ -164,7 +166,7 @@ guestfsd_LDADD = \
        liberrnostring.a \
        libprotocol.a \
        $(SELINUX_LIB) \
-       $(AUGEAS_LIB) \
+       $(AUGEAS_LIBS) \
        $(top_builddir)/gnulib/lib/.libs/libgnu.a \
        $(GETADDRINFO_LIB) \
        $(HOSTENT_LIB) \
@@ -174,7 +176,7 @@ guestfsd_LDADD = \
        $(LIBINTL) \
        $(SERVENT_LIB)
 
-guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
-guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
+guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS)
 
 .PHONY: force