X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=inspector%2FMakefile.am;h=5c48724d658798520f45814c09d0f516ac88b964;hp=d1dcb6d93d7dd914741d1b9e9967984939d5a8bd;hb=4accf3197235300029d04d0ab637b66eaaf9f8df;hpb=e1aca6323e33e0dd50e23dc0d638f5789c9188e4

diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index d1dcb6d..5c48724 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs virt-inspector
-# Copyright (C) 2009-2010 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
@@ -21,10 +21,18 @@ EXAMPLE_XML = \
 	example-debian.xml \
 	example-fedora.xml \
 	example-ubuntu.xml \
-	example-windows.xml
+	example-windows.xml \
+	example-debian-netinst-cd.xml \
+	example-fedora-dvd.xml \
+	example-fedora-netinst-cd.xml \
+	example-rhel-6-dvd.xml \
+	example-rhel-6-netinst-cd.xml \
+	example-ubuntu-live-cd.xml \
+	example-windows-2003-x64-cd.xml \
+	example-windows-2003-x86-cd.xml \
+	example-windows-xp-cd.xml
 
 EXTRA_DIST = \
-	run-inspector-locally \
 	virt-inspector.pod
 
 CLEANFILES = stamp-virt-inspector.pod
@@ -39,6 +47,7 @@ if HAVE_LIBXML2
 bin_PROGRAMS = virt-inspector
 
 SHARED_SOURCE_FILES = \
+	../fish/config.c \
 	../fish/inspect.c \
 	../fish/keys.c \
 	../fish/options.h \
@@ -50,14 +59,17 @@ 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 \
 	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
 	$(LIBXML2_CFLAGS) \
+	$(LIBCONFIG_CFLAGS) \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 virt_inspector_LDADD = \
+	$(LIBCONFIG_LIBS) \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	../gnulib/lib/libgnu.la
@@ -88,16 +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>' > $@
-
-# Build a partly-static library (for the binary distribution).
-
-virt-inspector.static$(EXEEXT): $(virt_inspector_OBJECTS) $(virt_inspector_DEPENDENCIES)
-	$(top_srcdir)/relink-static.sh \
-	$(virt_inspector_LINK) $(virt_inspector_OBJECTS) -static $(virt_inspector_LDADD) $(virt_inspector_LIBS) $(LIBVIRT_LIBS) $(LIBXML2_LIBS) -lpcre -lhivex -lmagic -lz -lm
+	rm -f $@ $@-t
+	../run $(builddir)/virt-inspector ../images/windows.img | \
+	    fgrep -v '<uuid>' > $@-t
+	mv $@-t $@