X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=fish%2FMakefile.am;h=30f246da6f776d73ca5b14c954a55408162a45f6;hb=7b45f7d04f8eecae7ab8e3db2193dcbbd3cd839f;hp=6debdceddfe4cdc3baee4d102ed2930c5e060cec;hpb=7509c91a71c729b3223eef4cde10d70daca66c72;p=libguestfs.git

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 6debdce..30f246d 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -17,6 +17,13 @@
 
 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 = \
@@ -82,10 +89,10 @@ 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.
@@ -126,29 +133,21 @@ 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)" \
-	  > $@
+noinst_DATA = $(top_builddir)/html/guestfish.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 $@
 
 # Bash completion script.