X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=test-tool%2FMakefile.am;h=1ed082083ae2ee4eb84fd5884d296c372e84c1ab;hb=3acf732c2f23d8508f692efb2b222169914bfcdc;hp=c28d131579ab766f93bf34ad14a5e2851d99da18;hpb=92444940f3ff80975e64e07e4a4861454101a529;p=libguestfs.git

diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
index c28d131..1ed0820 100644
--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2009-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
@@ -17,37 +17,22 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
-EXTRA_DIST = libguestfs-test-tool.pod run-test-tool-locally
+EXTRA_DIST = libguestfs-test-tool.pod
 
 CLEANFILES =
 
 bin_PROGRAMS = libguestfs-test-tool
-libexec_PROGRAMS = libguestfs-test-tool-helper
 man_MANS = libguestfs-test-tool.1
 
-AM_CPPFLAGS = \
-	-DDEFAULT_HELPER='"$(libexecdir)/libguestfs-test-tool-helper"'
-
 libguestfs_test_tool_SOURCES = test-tool.c
 libguestfs_test_tool_CFLAGS = \
 	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
-	-Wall
+	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 libguestfs_test_tool_LDADD = \
 	$(top_builddir)/src/libguestfs.la
 
-libguestfs_test_tool_helper_SOURCES = helper.c
-libguestfs_test_tool_helper_LDFLAGS = -all-static
-
-# Build a partly-static library (for the binary distribution).
-
-libguestfs-test-tool.static$(EXEEXT): $(libguestfs_test_tool_OBJECTS) $(libguestfs_test_tool_DEPENDENCIES)
-	$(top_srcdir)/relink-static.sh \
-	$(libguestfs_test_tool_LINK) $(libguestfs_test_tool_OBJECTS) -static $(libguestfs_test_tool_LDADD) $(libguestfs_test_tool_LIBS) $(LIBVIRT_LIBS) $(LIBXML2_LIBS) -lpcre -lhivex -lmagic -lz -lm
-
 libguestfs-test-tool.1: libguestfs-test-tool.pod
-	$(POD2MAN) \
-	  --section 1 \
-	  -c "Virtualization Support" \
-	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-	  $< > $@
+	$(top_srcdir)/podwrapper.sh \
+	  --man $@ \
+	  $<