From 7b65b7d323b1933cc1137e677d0e5c33d8bc7ff2 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 18 Aug 2009 10:15:57 +0200 Subject: [PATCH] avoid compiler warnings about unused vars in generated code * fish/Makefile.am: Compile rc_protocol.c into a convenience library, so it can have its own CFLAGS, and link that into guestfish. generator.ml: Use TABs, not spaces for indentation. --- fish/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fish/Makefile.am b/fish/Makefile.am index 8c289dc..5bf3fbd 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -35,12 +35,15 @@ guestfish_SOURCES = \ lcd.c \ more.c \ rc.c \ - rc_protocol.c \ - rc_protocol.h \ 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 @@ -50,8 +53,13 @@ guestfish_CFLAGS = \ -I$(top_srcdir)/fish -I$(top_builddir)/fish \ -Wall \ -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' + guestfish_LDADD = $(top_builddir)/src/libguestfs.la $(LIBREADLINE) +# Make libguestfs use the convenience library. +noinst_LTLIBRARIES = librc_protocol.la +guestfish_LDADD += librc_protocol.la + if HAVE_RPCGEN rc_protocol.c: rc_protocol.x rm -f $@-t $@-t2 -- 1.8.3.1