X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2FMakefile.am;h=c8ba3ea4f695ae6074b79dcc454215e90c42ca70;hp=8efa5a568397cf9c5ca21e0757d4212856886d32;hb=6cd965e007f65d6e62872c6ddd782f1de06046e3;hpb=612a358b8935381e5b8d706e4a77689cd316a18d

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 8efa5a5..c8ba3ea 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -17,15 +17,60 @@
 
 bin_PROGRAMS = guestfish
 
+EXTRA_DIST = \
+	rc_protocol.x
+
+CLEANFILES = rc_protocol.c rc_protocol.h
+
 guestfish_SOURCES = \
 	alloc.c \
 	cmds.c \
 	completion.c \
+	destpaths.c \
+	echo.c \
+	edit.c \
 	fish.c \
-	fish.h
+	fish.h \
+	glob.c \
+	lcd.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
+
+BUILT_SOURCES = \
+	rc_protocol.c \
+	rc_protocol.h
+
 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)
 
-CLEANFILES = *~
+# 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