X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2FMakefile.am;h=9e051702ef16b994d7b4d018c7bf9bc501259456;hb=c70532ab4b3d977ed7484e473107808b22d90a2a;hp=3eae8e47f52f7cdea025a4657d3d0ce740fa8186;hpb=b8e1dee73a1deef1bfd5937e2abfbe9afef7b1ef;p=libguestfs.git

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 3eae8e4..9e05170 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -46,6 +46,7 @@ EXTRA_DIST = \
 	rc_protocol.x \
 	guestfish.pod \
 	guestfish-bash-completion.sh \
+	libguestfs-tools.conf \
 	virt-copy-in \
 	virt-copy-out \
 	virt-tar-in \
@@ -74,6 +75,7 @@ guestfish_SOURCES = \
 	cmds_gperf.h \
 	copy.c \
 	destpaths.c \
+	display.c \
 	echo.c \
 	edit.c \
 	fish.c \
@@ -98,10 +100,10 @@ guestfish_SOURCES = \
 	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
+# This convenience library is solely to compile its generated sources with
+# custom flags.
+librc_protocol_la_SOURCES = rc_protocol.c rc_protocol.h
+librc_protocol_la_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
 
 # Build the command lookup perfect hash code.  The generated code has
 # lots of warnings so we must compile it in a separate mini-library.
@@ -114,9 +116,9 @@ cmds_gperf.c: cmds_gperf.gperf
 	mv $@-t $@
 
 guestfish_CFLAGS = \
+	-DGUESTFS_WARN_DEPRECATED=1 \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	-I$(top_srcdir)/fish -I$(top_builddir)/fish \
-	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
 	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
 	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \