X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2FMakefile.am;h=43dce00fdcd8c29e82cafbb6ddfa769638ea0b81;hp=5255e853f4c1671f2a8f648e0358916ee2ccb2b6;hb=9a608a1516bd339dc6d5ebe9952d3bced273c416;hpb=a86aa7d152ed996170714a3a4516eab58bf8b59d

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 5255e85..43dce00 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -15,12 +15,28 @@
 # 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
+
 bin_PROGRAMS = guestfish
 
-guestfish_SOURCES = \
-	alloc.c \
+generator_built = \
 	cmds.c \
 	completion.c \
+	guestfish-actions.pod
+
+BUILT_SOURCES = \
+	$(generator_built) \
+	rc_protocol.h \
+	rc_protocol.c
+
+EXTRA_DIST = \
+	$(BUILT_SOURCES) \
+	rc_protocol.x \
+	guestfish.pod
+
+guestfish_SOURCES = \
+	$(generator_built) \
+	alloc.c \
 	destpaths.c \
 	echo.c \
 	edit.c \
@@ -30,28 +46,56 @@ guestfish_SOURCES = \
 	lcd.c \
 	more.c \
 	rc.c \
-	rc_protocol.c \
-	rc_protocol.h \
 	reopen.c \
+	tilde.c \
 	time.c
 
-BUILT_SOURCES = \
-	rc_protocol.c \
-	rc_protocol.h
+# This convenience library is solely to avoid compiler warnings
+# in its generated sources.
+librc_protocol_la_SOURCES = rc_protocol.c
+librc_protocol_la_CFLAGS = -Wall -Wno-unused
 
 guestfish_CFLAGS = \
-	-I$(top_srcdir)/src -I$(top_builddir)/src -Wall \
-	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	-I$(top_srcdir)/fish -I$(top_builddir)/fish \
+	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
+	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
+	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+
 guestfish_LDADD = $(top_builddir)/src/libguestfs.la $(LIBREADLINE)
 
+# Make libguestfs use the convenience library.
+noinst_LTLIBRARIES = librc_protocol.la
+guestfish_LDADD += librc_protocol.la ../gnulib/lib/libgnu.la
+
 if HAVE_RPCGEN
 rc_protocol.c: rc_protocol.x
-	rm -f $@-t
+	rm -f $@-t $@-t2
 	$(RPCGEN) -c -o $@-t $<
-	mv $@-t $@
+	sed 's,\.\./\.\./fish/,,' < $@-t > $@-t2
+	rm $@-t
+	mv $@-t2 $@
 
 rc_protocol.h: rc_protocol.x
 	rm -f $@-t
 	$(RPCGEN) -h -o $@-t $<
 	mv $@-t $@
 endif
+
+# Manual page.
+# guestfish-actions.pod is autogenerated.  There is no include
+# mechanism for POD, so we have to do it by hand.
+
+man_MANS = guestfish.1
+
+guestfish.1: guestfish.pod guestfish-actions.pod
+	sed \
+	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
+	  < $< | \
+	$(POD2MAN) \
+	  --section 1 \
+	  -c "Virtualization Support" \
+	  --name "guestfish" \
+	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
+	  > $@