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

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 5bf3fbd..795952a 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -15,17 +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
 
-CLEANFILES = rc_protocol.c rc_protocol.h
-
 guestfish_SOURCES = \
+	$(generator_built) \
 	alloc.c \
-	cmds.c \
-	completion.c \
 	destpaths.c \
 	echo.c \
 	edit.c \
@@ -44,21 +53,18 @@ guestfish_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 \
 	-I$(top_srcdir)/fish -I$(top_builddir)/fish \
-	-Wall \
-	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
+	-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
+guestfish_LDADD += librc_protocol.la ../gnulib/lib/libgnu.la
 
 if HAVE_RPCGEN
 rc_protocol.c: rc_protocol.x