X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fuse%2FMakefile.am;h=577f51e111c41309a42c29fd539a89c1ad782739;hb=0d9f2c7311b005b2cfe2ecb3ff9fb57d4576ef7b;hp=5fe57bbfd45b5126f0585205084fc8885c4474f4;hpb=92444940f3ff80975e64e07e4a4861454101a529;p=libguestfs.git

diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index 5fe57bb..577f51e 100644
--- a/fuse/Makefile.am
+++ b/fuse/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
@@ -19,6 +19,8 @@ include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = guestmount.pod test-fuse.sh
 
+CLEANFILES = stamp-guestmount.pod
+
 if HAVE_FUSE
 
 bin_PROGRAMS = guestmount
@@ -26,6 +28,7 @@ bin_PROGRAMS = guestmount
 # These source files (all related to option parsing) are shared
 # between guestfish and guestmount.
 SHARED_SOURCE_FILES = \
+	../fish/config.c \
 	../fish/inspect.c \
 	../fish/keys.c \
 	../fish/options.h \
@@ -46,41 +49,28 @@ guestmount_CFLAGS = \
 	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
 	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
 	$(FUSE_CFLAGS) \
+	$(LIBCONFIG_CFLAGS) \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 guestmount_LDADD = \
 	$(FUSE_LIBS) -lulockmgr \
+	$(LIBCONFIG_LIBS) \
 	$(top_builddir)/src/libguestfs.la \
 	../gnulib/lib/libgnu.la
 
-# Build a partly-static library (for the binary distribution).
-
-guestmount.static$(EXEEXT): $(guestmount_OBJECTS) $(guestmount_DEPENDENCIES)
-	$(top_srcdir)/relink-static.sh \
-	$(guestmount_LINK) $(guestmount_OBJECTS) -static $(guestmount_LDADD) $(guestmount_LIBS) $(LIBVIRT_LIBS) $(LIBXML2_LIBS) -lpcre -lhivex -lmagic -lz -lm
-
 # Documentation.
 
 man_MANS = guestmount.1
+noinst_DATA = $(top_builddir)/html/guestmount.1.html
+
+guestmount.1 $(top_builddir)/html/guestmount.1.html: stamp-guestmount.pod
 
-guestmount.1: guestmount.pod
-	$(POD2MAN) \
-	  --section 1 \
-	  -c "Virtualization Support" \
-	  --name "guestmount" \
-	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-	  $< > $@-t; mv $@-t $@
-
-noinst_DATA = \
-	$(top_builddir)/html/guestmount.1.html
-
-$(top_builddir)/html/guestmount.1.html: guestmount.pod
-	mkdir -p $(top_builddir)/html
-	cd $(top_builddir) && pod2html \
-	  --css 'pod.css' \
-	  --htmldir html \
-	  --outfile html/guestmount.1.html \
-	  fuse/guestmount.pod
+stamp-guestmount.pod: guestmount.pod
+	$(top_srcdir)/podwrapper.sh \
+	  --man guestmount.1 \
+	  --html $(top_builddir)/html/guestmount.1.html \
+	  $<
+	touch $@
 
 # Tests.