X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2FMakefile.am;h=b275ebccdbf647b77a3595261dae5431c4608f51;hb=00100179e49d0c6a8a25a3df61f14d320e81c7ef;hp=01ed59c74c9524a20c7ee12900b8591a1caea720;hpb=e1aca6323e33e0dd50e23dc0d638f5789c9188e4;p=libguestfs.git

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 01ed59c..b275ebc 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -17,7 +17,12 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
-CLEANFILES = stamp-guestfish.pod
+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
 
@@ -25,6 +30,7 @@ generator_built = \
 	cmds.c \
 	cmds_gperf.gperf \
 	completion.c \
+	fish-cmds.h \
 	guestfish-actions.pod \
 	guestfish-commands.pod \
 	prepopts.h \
@@ -84,10 +90,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.
@@ -128,12 +134,6 @@ 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) $(LIBVIRT_LIBS) $(LIBXML2_LIBS) -ltinfo -lpcre -lhivex -lmagic -lz -lm
-
 # Manual page.
 
 man_MANS = guestfish.1