X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2FMakefile.am;h=9e051702ef16b994d7b4d018c7bf9bc501259456;hp=e3221ca526261a8a095643df49e98783e5e73a5f;hb=dfb89e3556c02bcc5fbe62f90e3c716a2cbe93da;hpb=c66d6f215e8303d4eaf8ccfdb6a58cff04ccc485

diff --git a/fish/Makefile.am b/fish/Makefile.am
index e3221ca..9e05170 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009-2010 Red Hat Inc.
+# Copyright (C) 2009-2011 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
@@ -17,10 +17,18 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
+CLEANFILES = \
+	stamp-guestfish.pod \
+	stamp-virt-copy-in.pod \
+	stamp-virt-copy-out.pod \
+	stamp-virt-tar-in.pod \
+	stamp-virt-tar-out.pod
+
 bin_PROGRAMS = guestfish
 
 generator_built = \
 	cmds.c \
+	cmds_gperf.gperf \
 	completion.c \
 	guestfish-actions.pod \
 	guestfish-commands.pod \
@@ -29,6 +37,7 @@ generator_built = \
 
 BUILT_SOURCES = \
 	$(generator_built) \
+	cmds_gperf.c \
 	rc_protocol.h \
 	rc_protocol.c
 
@@ -36,14 +45,25 @@ EXTRA_DIST = \
 	$(BUILT_SOURCES) \
 	rc_protocol.x \
 	guestfish.pod \
-	guestfish-bash-completion.sh
+	guestfish-bash-completion.sh \
+	libguestfs-tools.conf \
+	virt-copy-in \
+	virt-copy-out \
+	virt-tar-in \
+	virt-tar-out \
+	virt-copy-in.pod \
+	virt-copy-out.pod \
+	virt-tar-in.pod \
+	virt-tar-out.pod
 
 # These source files (all related to option parsing) are shared
 # between guestfish and guestmount.  Keep a convenient list here just
 # so we know which ones are shared.  These files must not include
 # other guestfish files.
 SHARED_SOURCE_FILES = \
+	config.c \
 	inspect.c \
+	keys.c \
 	options.h \
 	options.c \
 	virt.c
@@ -52,13 +72,16 @@ guestfish_SOURCES = \
 	$(generator_built) \
 	$(SHARED_SOURCE_FILES) \
 	alloc.c \
+	cmds_gperf.h \
 	copy.c \
 	destpaths.c \
+	display.c \
 	echo.c \
 	edit.c \
 	fish.c \
 	fish.h \
 	glob.c \
+	help.c \
 	hexedit.c \
 	lcd.c \
 	man.c \
@@ -77,27 +100,38 @@ guestfish_SOURCES = \
 	tilde.c \
 	time.c
 
-# 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
+# This convenience library is solely to compile its generated sources with
+# custom flags.
+librc_protocol_la_SOURCES = rc_protocol.c rc_protocol.h
+librc_protocol_la_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
+
+# Build the command lookup perfect hash code.  The generated code has
+# lots of warnings so we must compile it in a separate mini-library.
+libcmds_la_SOURCES = cmds_gperf.c
+libcmds_la_CFLAGS =
+
+cmds_gperf.c: cmds_gperf.gperf
+	rm -f $@
+	$(GPERF) -t $< > $@-t
+	mv $@-t $@
 
 guestfish_CFLAGS = \
+	-DGUESTFS_WARN_DEPRECATED=1 \
 	-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 \
-	$(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
-	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(LIBCONFIG_CFLAGS)
 
 guestfish_LDADD = \
-	$(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
-	$(top_builddir)/src/libguestfs.la $(LIBREADLINE) -lm
+	$(LIBCONFIG_LIBS) \
+	$(LIBREADLINE) \
+	$(top_builddir)/src/libguestfs.la -lm
 
-# Make libguestfs use the convenience library.
-noinst_LTLIBRARIES = librc_protocol.la
-guestfish_LDADD += librc_protocol.la ../gnulib/lib/libgnu.la
+# Make guestfish use the convenience libraries.
+noinst_LTLIBRARIES = libcmds.la librc_protocol.la
+guestfish_LDADD += libcmds.la librc_protocol.la ../gnulib/lib/libgnu.la
 
 if HAVE_RPCGEN
 rc_protocol.c: rc_protocol.x
@@ -113,29 +147,76 @@ 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) -ltinfo -lpcre -lhivex -lmagic -lz -lm
-
-# Manual page.
-# guestfish-actions.pod and guestfish-commands.pod are 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 guestfish-commands.pod
-	sed \
-	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
-	  -e '/@FISH_COMMANDS@/rguestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
-	  < $< | \
-	$(POD2MAN) \
-	  --section 1 \
-	  -c "Virtualization Support" \
-	  --name "guestfish" \
-	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-	  > $@
+# Script wrappers.
+
+bin_SCRIPTS = virt-copy-in virt-copy-out virt-tar-in virt-tar-out
+
+# Manual pages.
+
+man_MANS = \
+	guestfish.1 \
+	virt-copy-in.1 \
+	virt-copy-out.1 \
+	virt-tar-in.1 \
+	virt-tar-out.1
+noinst_DATA = \
+	$(top_builddir)/html/guestfish.1.html \
+	$(top_builddir)/html/virt-copy-in.1.html \
+	$(top_builddir)/html/virt-copy-out.1.html \
+	$(top_builddir)/html/virt-tar-in.1.html \
+	$(top_builddir)/html/virt-tar-out.1.html
+
+guestfish.1 $(top_builddir)/html/guestfish.1.html: stamp-guestfish.pod
+
+stamp-guestfish.pod: guestfish.pod guestfish-actions.pod guestfish-commands.pod
+	$(top_srcdir)/podwrapper.sh \
+	  --man guestfish.1 \
+	  --html $(top_builddir)/html/guestfish.1.html \
+	  --insert guestfish-actions.pod:@ACTIONS@ \
+	  --insert guestfish-commands.pod:@FISH_COMMANDS@ \
+	  $<
+	touch $@
+
+virt-copy-in.1 $(top_builddir)/html/virt-copy-in.1.html: stamp-virt-copy-in.pod
+
+stamp-virt-copy-in.pod: virt-copy-in.pod
+	$(top_srcdir)/podwrapper.sh \
+	  --man virt-copy-in.1 \
+	  --html $(top_builddir)/html/virt-copy-in.1.html \
+	  $<
+	touch $@
+
+virt-copy-out.1 $(top_builddir)/html/virt-copy-out.1.html: stamp-virt-copy-out.pod
+
+stamp-virt-copy-out.pod: virt-copy-out.pod
+	$(top_srcdir)/podwrapper.sh \
+	  --man virt-copy-out.1 \
+	  --html $(top_builddir)/html/virt-copy-out.1.html \
+	  $<
+	touch $@
+
+virt-tar-in.1 $(top_builddir)/html/virt-tar-in.1.html: stamp-virt-tar-in.pod
+
+stamp-virt-tar-in.pod: virt-tar-in.pod
+	$(top_srcdir)/podwrapper.sh \
+	  --man virt-tar-in.1 \
+	  --html $(top_builddir)/html/virt-tar-in.1.html \
+	  $<
+	touch $@
+
+virt-tar-out.1 $(top_builddir)/html/virt-tar-out.1.html: stamp-virt-tar-out.pod
+
+stamp-virt-tar-out.pod: virt-tar-out.pod
+	$(top_srcdir)/podwrapper.sh \
+	  --man virt-tar-out.1 \
+	  --html $(top_builddir)/html/virt-tar-out.1.html \
+	  $<
+	touch $@
+
+# libguestfs tools config file.
+
+toolsconfdir = $(sysconfdir)
+toolsconf_DATA = libguestfs-tools.conf
 
 # Bash completion script.