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 --- xlators/cluster/afr/src/Makefile.am | 6 ++++-- xlators/cluster/dht/src/Makefile.am | 5 +++-- xlators/cluster/ha/src/Makefile.am | 5 +++-- xlators/cluster/map/src/Makefile.am | 5 +++-- xlators/cluster/stripe/src/Makefile.am | 5 +++-- 5 files changed, 16 insertions(+), 10 deletions(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am index c2a911064df..ef6bf978692 100644 --- a/xlators/cluster/afr/src/Makefile.am +++ b/xlators/cluster/afr/src/Makefile.am @@ -21,9 +21,11 @@ noinst_HEADERS = afr.h afr-transaction.h afr-inode-write.h afr-inode-read.h \ afr-self-heald.h $(top_builddir)/xlators/lib/src/libxlator.h \ $(top_builddir)/glusterfsd/src/glusterfsd.h -AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ +AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src \ - -I$(top_srcdir)/rpc/rpc-lib/src $(GF_CFLAGS) + -I$(top_srcdir)/rpc/rpc-lib/src + +AM_CFLAGS = -Wall $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am index 905340df2ea..b78af1ff366 100644 --- a/xlators/cluster/dht/src/Makefile.am +++ b/xlators/cluster/dht/src/Makefile.am @@ -24,10 +24,11 @@ switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = dht-common.h dht-mem-types.h \ $(top_builddir)/xlators/lib/src/libxlator.h -AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) \ +AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(top_srcdir)/xlators/lib/src +AM_CFLAGS = -Wall $(GF_CFLAGS) + CLEANFILES = uninstall-local: diff --git a/xlators/cluster/ha/src/Makefile.am b/xlators/cluster/ha/src/Makefile.am index d047b073327..c5da56ff123 100644 --- a/xlators/cluster/ha/src/Makefile.am +++ b/xlators/cluster/ha/src/Makefile.am @@ -8,8 +8,9 @@ ha_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = ha.h -AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) +AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src + +AM_CFLAGS = -Wall $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/cluster/map/src/Makefile.am b/xlators/cluster/map/src/Makefile.am index 9d02f1bdda9..a51c13573c3 100644 --- a/xlators/cluster/map/src/Makefile.am +++ b/xlators/cluster/map/src/Makefile.am @@ -8,8 +8,9 @@ map_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = map.h -AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) +AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src + +AM_CFLAGS = -Wall $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am index 0ab5193a2e0..42846df83a7 100644 --- a/xlators/cluster/stripe/src/Makefile.am +++ b/xlators/cluster/stripe/src/Makefile.am @@ -11,9 +11,10 @@ stripe_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = stripe.h stripe-mem-types.h $(top_builddir)/xlators/lib/src/libxlator.h -AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) \ +AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(top_srcdir)/xlators/lib/src +AM_CFLAGS = -Wall $(GF_CFLAGS) + CLEANFILES = -- cgit