X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2FMakefile.am;h=94bf7570ca7cc37d0a7d1d7273b27136927e9e44;hp=5255e853f4c1671f2a8f648e0358916ee2ccb2b6;hb=89c3e552e311744c4a26194b48c07c5bd2d9dd83;hpb=a86aa7d152ed996170714a3a4516eab58bf8b59d

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 5255e85..94bf757 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -17,6 +17,11 @@
 
 bin_PROGRAMS = guestfish
 
+EXTRA_DIST = \
+	rc_protocol.x
+
+CLEANFILES = rc_protocol.c rc_protocol.h
+
 guestfish_SOURCES = \
 	alloc.c \
 	cmds.c \
@@ -30,25 +35,38 @@ guestfish_SOURCES = \
 	lcd.c \
 	more.c \
 	rc.c \
-	rc_protocol.c \
-	rc_protocol.h \
 	reopen.c \
+	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
+
 BUILT_SOURCES = \
 	rc_protocol.c \
 	rc_protocol.h
 
 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"' \
+	$(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
+
 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