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

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 9ec0cf4..c8ba3ea 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,39 @@ 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"' \
+	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
+	$(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 ../gnulib/lib/libgnu.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