X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2FMakefile.am;h=5bf3fbd1238391a6d6a7ac8275fad0276f13be8b;hp=9ec0cf4924e6578c3226cf5d91acf78442770c43;hb=7b65b7d323b1933cc1137e677d0e5c33d8bc7ff2;hpb=9449b0fce4145a56df9d43169d61e8b2c4e41b09

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 9ec0cf4..5bf3fbd 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -20,6 +20,8 @@ bin_PROGRAMS = guestfish
 EXTRA_DIST = \
 	rc_protocol.x
 
+CLEANFILES = rc_protocol.c rc_protocol.h
+
 guestfish_SOURCES = \
 	alloc.c \
 	cmds.c \
@@ -33,26 +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 \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	-I$(top_srcdir)/fish -I$(top_builddir)/fish \
+	-Wall \
 	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
+
 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