git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: Improve output of guestfish -h cmd
[libguestfs.git]
/
fish
/
Makefile.am
diff --git
a/fish/Makefile.am
b/fish/Makefile.am
index
8c289dc
..
c8ba3ea
100644
(file)
--- a/
fish/Makefile.am
+++ b/
fish/Makefile.am
@@
-35,12
+35,15
@@
guestfish_SOURCES = \
lcd.c \
more.c \
rc.c \
lcd.c \
more.c \
rc.c \
- rc_protocol.c \
- rc_protocol.h \
reopen.c \
tilde.c \
time.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
BUILT_SOURCES = \
rc_protocol.c \
rc_protocol.h
@@
-48,10
+51,16
@@
BUILT_SOURCES = \
guestfish_CFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-I$(top_srcdir)/fish -I$(top_builddir)/fish \
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)
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
if HAVE_RPCGEN
rc_protocol.c: rc_protocol.x
rm -f $@-t $@-t2