X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fuse%2FMakefile.am;h=5fe57bbfd45b5126f0585205084fc8885c4474f4;hp=5d5ea3096626944441dd314511ee177626ac9db8;hb=fab75c0337d7897d10ea5e95e47ac05eab81ace9;hpb=429de2254176e470035eef05e0f3e9910d46863c

diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index 5d5ea30..5fe57bb 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -15,21 +15,36 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-EXTRA_DIST = fusexmp.c fusexmp_fh.c
+include $(top_srcdir)/subdir-rules.mk
+
+EXTRA_DIST = guestmount.pod test-fuse.sh
 
 if HAVE_FUSE
 
 bin_PROGRAMS = guestmount
 
+# These source files (all related to option parsing) are shared
+# between guestfish and guestmount.
+SHARED_SOURCE_FILES = \
+	../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
+	guestmount.c \
+	guestmount.h
 
 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) \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 
@@ -38,6 +53,14 @@ guestmount_LDADD = \
 	$(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
 
 guestmount.1: guestmount.pod
@@ -59,4 +82,10 @@ $(top_builddir)/html/guestmount.1.html: guestmount.pod
 	  --outfile html/guestmount.1.html \
 	  fuse/guestmount.pod
 
+# Tests.
+
+TESTS = test-fuse.sh
+TESTS_ENVIRONMENT = \
+	top_builddir=..
+
 endif