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

diff --git a/df/Makefile.am b/df/Makefile.am
index f148e6c..d3b8e65 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -47,11 +47,14 @@ virt_df_CFLAGS = \
 	-I$(top_srcdir)/fish \
 	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
 	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(LIBVIRT_CFLAGS)
 
 virt_df_LDADD = \
 	$(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
@@ -73,12 +76,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