X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2FMakefile.am;h=795952a96480e3ac54ddd3cf1e6379a958e4b894;hp=34b1a0b2043b2a80729bd549ae9d00fab9e995c4;hb=4d45c45f0928c7791429d351dc69b75167888f7d;hpb=19a1382fc9317ab88cdbf1dde76a8015868af51d

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 34b1a0b..795952a 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -15,12 +15,26 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 bin_PROGRAMS = guestfish
 
+generator_built = \
+	cmds.c \
+	completion.c
+
+BUILT_SOURCES = \
+	$(generator_built) \
+	rc_protocol.h \
+	rc_protocol.c
+
+EXTRA_DIST = \
+	$(BUILT_SOURCES) \
+	rc_protocol.x
+
 guestfish_SOURCES = \
+	$(generator_built) \
 	alloc.c \
-	cmds.c \
-	completion.c \
 	destpaths.c \
 	echo.c \
 	edit.c \
@@ -28,9 +42,40 @@ guestfish_SOURCES = \
 	fish.h \
 	glob.c \
 	lcd.c \
-	more.c
+	more.c \
+	rc.c \
+	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
 
 guestfish_CFLAGS = \
-	-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 $@-t2
+	$(RPCGEN) -c -o $@-t $<
+	sed 's,\.\./\.\./fish/,,' < $@-t > $@-t2
+	rm $@-t
+	mv $@-t2 $@
+
+rc_protocol.h: rc_protocol.x
+	rm -f $@-t
+	$(RPCGEN) -h -o $@-t $<
+	mv $@-t $@
+endif