X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=df%2FMakefile.am;h=6281c9675fbd86a1dc0c4b883e11ad141b1543eb;hb=2ace9be4cd69e84cd88e5b0fd74de861a4973c91;hp=f148e6cebcc0313ed2c05fcf05eb4bcaf157165c;hpb=18374b5b7d3154e0b8b8a07e3590f6eee762b58e;p=libguestfs.git

diff --git a/df/Makefile.am b/df/Makefile.am
index f148e6c..6281c96 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,15 +43,21 @@ 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)
+	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(LIBCONFIG_CFLAGS) \
+	$(LIBVIRT_CFLAGS)
 
 virt_df_LDADD = \
+	$(LIBCONFIG_LIBS) \
 	$(top_builddir)/src/libguestfs.la \
-	../gnulib/lib/libgnu.la -lm
+	../gnulib/lib/libgnu.la \
+	$(LIBVIRT_LIBS) \
+	-lm
 
 # Manual pages and HTML files for the website.
 man_MANS = virt-df.1
@@ -60,7 +66,7 @@ noinst_DATA = $(top_builddir)/html/virt-df.1.html
 virt-df.1 $(top_builddir)/html/virt-df.1.html: stamp-virt-df.pod
 
 stamp-virt-df.pod: virt-df.pod
-	$(top_srcdir)/podwrapper.sh \
+	$(top_builddir)/podwrapper.sh \
 	  --man virt-df.1 \
 	  --html $(top_builddir)/html/virt-df.1.html \
 	  $<
@@ -73,12 +79,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
-	LIBGUESTFS_PATH=$(top_builddir)/appliance
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	TMPDIR=$(top_builddir)
 
 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