From 58e6296fa2b59506cacab32689df77a211e578cb Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Wed, 3 Oct 2012 09:48:45 -0400 Subject: build: split CPPFLAGS from CFLAGS Automake provides a separate variable for preprocessor flags (*_CPPFLAGS). They are already uses in a few places, so make it consistent and use it everywhere. Note that cflags obtained from pkg-config often are cppflags, which is why LIBXML2_CFLAGS moves with into AM_CPPFLAGS, for example. Change-Id: I15feed1d18b2ca497371271c4b5876d5ec6289dd BUG: 862082 Original-author: Jan Engelhardt Signed-off-by: Jan Engelhardt Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.org/4029 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- cli/src/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cli') diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index b58fe3725..8b5a5054e 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -11,15 +11,17 @@ gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD)\ gluster_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS) $(LIBXML2_LIBS) noinst_HEADERS = cli.h cli-mem-types.h cli-cmd.h -AM_CFLAGS = -Wall $(GF_CPPFLAGS) \ +AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src\ -I$(top_srcdir)/rpc/xdr/src\ -DDATADIR=\"$(localstatedir)\" \ - -DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS)\ + -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\ $(LIBXML2_CFLAGS) +AM_CFLAGS = -Wall $(GF_GLUSTERFS_CFLAGS) + CLEANFILES = $(top_builddir)/libglusterfs/src/libglusterfs.la: -- cgit