fish: Use core add-domain API to implement '-d' option.

[libguestfs.git] / fuse / Makefile.am

diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index c041058..0a1d9da 100644 (file)
--- 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.
 
-EXTRA_DIST = guestmount.pod
+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,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) -lpcre -lhivex -lmagic -lz -lm
+
+# Documentation.
+
 man_MANS = guestmount.1
 
 guestmount.1: guestmount.pod
@@ -60,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