X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=inspector%2FMakefile.am;h=338afe30c545d7058deca148c2853b63a3923628;hb=c11a92751e003b3d4bc3584b598afc9bd9d9e703;hp=69b5683ead36662be12a4244fc7d72842bca45f7;hpb=b8e1dee73a1deef1bfd5937e2abfbe9afef7b1ef;p=libguestfs.git

diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 69b5683..338afe3 100644
--- a/inspector/Makefile.am
+++ b/inspector/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,7 +33,6 @@ EXAMPLE_XML = \
 	example-windows-xp-cd.xml
 
 EXTRA_DIST = \
-	run-inspector-locally \
 	virt-inspector.pod
 
 CLEANFILES = stamp-virt-inspector.pod
@@ -60,6 +59,7 @@ virt_inspector_SOURCES = \
 	virt-inspector.c
 
 virt_inspector_CFLAGS = \
+	-DGUESTFS_WARN_DEPRECATED=1 \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	-I$(top_srcdir)/fish \
 	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
@@ -81,7 +81,7 @@ noinst_DATA = $(top_builddir)/html/virt-inspector.1.html
 virt-inspector.1 $(top_builddir)/html/virt-inspector.1.html: stamp-virt-inspector.pod
 
 stamp-virt-inspector.pod: virt-inspector.pod
-	$(top_srcdir)/podwrapper.sh \
+	$(top_builddir)/podwrapper.sh \
 	  --man virt-inspector.1 \
 	  --html $(top_builddir)/html/virt-inspector.1.html \
 	  $<
@@ -90,7 +90,7 @@ stamp-virt-inspector.pod: virt-inspector.pod
 if HAVE_XMLLINT
 
 TESTS = $(EXAMPLE_XML)
-TESTS_ENVIRONMENT = $(XMLLINT) --noout --relaxng virt-inspector.rng
+TESTS_ENVIRONMENT = $(XMLLINT) --noout --relaxng $(srcdir)/virt-inspector.rng
 
 endif
 
@@ -100,10 +100,19 @@ endif
 # can run them.  Instead you can run them by hand.
 
 example-debian.xml:
-	./run-inspector-locally ../images/debian.img > $@
+	rm -f $@ $@-t
+	../run $(builddir)/virt-inspector ../images/debian.img > $@-t
+	mv $@-t $@
 example-fedora.xml:
-	./run-inspector-locally ../images/fedora.img > $@
+	rm -f $@ $@-t
+	../run $(builddir)/virt-inspector ../images/fedora.img > $@-t
+	mv $@-t $@
 example-ubuntu.xml:
-	./run-inspector-locally ../images/ubuntu.img > $@
+	rm -f $@ $@-t
+	../run $(builddir)/virt-inspector ../images/ubuntu.img > $@-t
+	mv $@-t $@
 example-windows.xml:
-	./run-inspector-locally ../images/windows.img | fgrep -v '<uuid>' > $@
+	rm -f $@ $@-t
+	../run $(builddir)/virt-inspector ../images/windows.img | \
+	    fgrep -v '<uuid>' > $@-t
+	mv $@-t $@