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

diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index c041058..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
@@ -15,13 +15,28 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-EXTRA_DIST = guestmount.pod
+include $(top_srcdir)/subdir-rules.mk
+
+EXTRA_DIST = guestmount.pod test-fuse.sh
+
+CLEANFILES = stamp-guestmount.pod
 
 if HAVE_FUSE
 
 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 \
+	../fish/options.c \
+	../fish/virt.c
+
 guestmount_SOURCES = \
+	$(SHARED_SOURCE_FILES) \
 	dircache.c \
 	dircache.h \
 	guestmount.c \
@@ -29,35 +44,38 @@ guestmount_SOURCES = \
 
 guestmount_CFLAGS = \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	-I$(top_srcdir)/fish \
 	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
 	-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
 
+# Documentation.
+
 man_MANS = guestmount.1
+noinst_DATA = $(top_builddir)/html/guestmount.1.html
+
+guestmount.1 $(top_builddir)/html/guestmount.1.html: stamp-guestmount.pod
+
+stamp-guestmount.pod: guestmount.pod
+	$(top_srcdir)/podwrapper.sh \
+	  --man guestmount.1 \
+	  --html $(top_builddir)/html/guestmount.1.html \
+	  $<
+	touch $@
+
+# Tests.
 
-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
+TESTS = test-fuse.sh
+TESTS_ENVIRONMENT = \
+	top_builddir=..
 
 endif