X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2FMakefile.am;h=4060f1f80cab739477673d7b7a5835400d54cca3;hp=3dc1a1eaff142e1f805f4e315bbc47061f9c82c9;hb=a0d514f13d3334b79745d7d1f90a6ac615afa7c2;hpb=78d2523ec8997679f7fca810de60620df4001e16

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 3dc1a1e..4060f1f 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2009-2010 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
@@ -32,7 +32,8 @@ BUILT_SOURCES = \
 EXTRA_DIST = \
 	$(BUILT_SOURCES) \
 	rc_protocol.x \
-	guestfish.pod
+	guestfish.pod \
+	guestfish-bash-completion.sh
 
 guestfish_SOURCES = \
 	$(generator_built) \
@@ -43,14 +44,17 @@ guestfish_SOURCES = \
 	fish.c \
 	fish.h \
 	glob.c \
+	inspect.c \
 	lcd.c \
 	man.c \
 	more.c \
 	prep.c \
 	rc.c \
 	reopen.c \
+	supported.c \
 	tilde.c \
-	time.c
+	time.c \
+	virt.c
 
 # This convenience library is solely to avoid compiler warnings
 # in its generated sources.
@@ -63,9 +67,12 @@ guestfish_CFLAGS = \
 	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
 	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
 	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
+	$(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 
-guestfish_LDADD = $(top_builddir)/src/libguestfs.la $(LIBREADLINE)
+guestfish_LDADD = \
+	$(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
+	$(top_builddir)/src/libguestfs.la $(LIBREADLINE)
 
 # Make libguestfs use the convenience library.
 noinst_LTLIBRARIES = librc_protocol.la
@@ -85,6 +92,12 @@ rc_protocol.h: rc_protocol.x
 	mv $@-t $@
 endif
 
+# Build a partly-static library (for the binary distribution).
+
+guestfish.static$(EXEEXT): $(guestfish_OBJECTS) $(guestfish_DEPENDENCIES)
+	$(top_srcdir)/relink-static.sh \
+	$(guestfish_LINK) $(guestfish_OBJECTS) -static $(guestfish_LDADD) $(guestfish_LIBS) -lpcre -lhivex -lmagic -lz -lm
+
 # Manual page.
 # guestfish-actions.pod is autogenerated.  There is no include
 # mechanism for POD, so we have to do it by hand.
@@ -101,3 +114,8 @@ guestfish.1: guestfish.pod guestfish-actions.pod
 	  --name "guestfish" \
 	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
 	  > $@
+
+# Bash completion script.
+
+bashcompletiondir = $(sysconfdir)/bash_completion.d
+bashcompletion_DATA = guestfish-bash-completion.sh