X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=df%2FMakefile.am;h=17117985cc812f821a7a3cc5dda3da5b62880612;hb=d28d76b4fba3afe18757ab848346e8123a8bcae1;hp=053261d804633c2cefd0f40d25fd0f6be4f7a389;hpb=18de192b0a4b71ade57acc0b6af311cc17a1bf0a;p=libguestfs.git

diff --git a/df/Makefile.am b/df/Makefile.am
index 053261d..1711798 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs virt-df
-# Copyright (C) 2010 Red Hat Inc.
+# Copyright (C) 2010-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
@@ -19,7 +19,6 @@ include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \
 	README \
-	run-df-locally \
 	test-virt-df.sh \
 	virt-df.pod
 
@@ -28,6 +27,7 @@ CLEANFILES = stamp-virt-df.pod
 bin_PROGRAMS = virt-df
 
 SHARED_SOURCE_FILES = \
+	../fish/config.c \
 	../fish/inspect.c \
 	../fish/keys.c \
 	../fish/options.h \
@@ -43,14 +43,17 @@ virt_df_SOURCES = \
 	output.c
 
 virt_df_CFLAGS = \
+	-DGUESTFS_WARN_DEPRECATED=1 \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	-I$(top_srcdir)/fish \
 	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
 	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(LIBCONFIG_CFLAGS) \
 	$(LIBVIRT_CFLAGS)
 
 virt_df_LDADD = \
+	$(LIBCONFIG_LIBS) \
 	$(top_builddir)/src/libguestfs.la \
 	../gnulib/lib/libgnu.la \
 	$(LIBVIRT_LIBS) \
@@ -79,9 +82,3 @@ TESTS_ENVIRONMENT = \
 	LIBGUESTFS_PATH=$(top_builddir)/appliance
 
 TESTS = test-virt-df.sh
-
-# Build a partly-static binary (for the binary distribution).
-
-virt-df.static$(EXEEXT): $(virt_df_OBJECTS) $(virt_df_DEPENDENCIES)
-	$(top_srcdir)/relink-static.sh \
-	$(virt_df_LINK) $(virt_df_OBJECTS) -static $(virt_df_LDADD) $(virt_df_LIBS) $(LIBVIRT_LIBS) $(LIBXML2_LIBS) -lpcre -lhivex -lmagic -lz -lm