X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fuse%2FMakefile.am;h=5fe57bbfd45b5126f0585205084fc8885c4474f4;hb=ccea24323b1646badf463aaf0ce9fa46adb890fd;hp=d582c651388aad34cce320fdf59413c0bd93d6bd;hpb=4ffd4d460bd4b239ea9bcb60fbd225a7d37cb200;p=libguestfs.git

diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index d582c65..5fe57bb 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -15,13 +15,25 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+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 \
@@ -29,8 +41,10 @@ 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) \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 
@@ -39,6 +53,12 @@ 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