[Gluster-devel] [PATCH 13/15] build: split CPPFLAGS from CFLAGS

gluster-devel
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gluster-devel] [PATCH 13/15] build: split CPPFLAGS from CFLAGS

From:	Jan Engelhardt
Subject:	[Gluster-devel] [PATCH 13/15] build: split CPPFLAGS from CFLAGS
Date:	Tue, 25 Sep 2012 18:41:11 +0200
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.

Signed-off-by: Jan Engelhardt <address@hidden>
---
 api/src/Makefile.am                               |    7 ++++---
 cli/src/Makefile.am                               |    6 ++++--
 contrib/fuse-util/Makefile.am                     |    4 +++-
 glusterfsd/src/Makefile.am                        |    6 ++++--
 rpc/rpc-lib/src/Makefile.am                       |    5 +++--
 rpc/rpc-transport/rdma/src/Makefile.am            |    6 ++++--
 rpc/rpc-transport/socket/src/Makefile.am          |    6 ++++--
 xlators/bindings/python/src/Makefile.am           |    4 +++-
 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 +++--
 xlators/debug/error-gen/src/Makefile.am           |    5 +++--
 xlators/debug/io-stats/src/Makefile.am            |    5 +++--
 xlators/debug/trace/src/Makefile.am               |    5 +++--
 xlators/encryption/rot-13/src/Makefile.am         |    5 +++--
 xlators/features/filter/src/Makefile.am           |    5 +++--
 xlators/features/index/src/Makefile.am            |    6 ++++--
 xlators/features/locks/src/Makefile.am            |    6 +++---
 xlators/features/mac-compat/src/Makefile.am       |    5 +++--
 xlators/features/marker/src/Makefile.am           |    6 ++++--
 xlators/features/marker/utils/src/Makefile.am     |    5 +++--
 xlators/features/path-convertor/src/Makefile.am   |    5 +++--
 xlators/features/quiesce/src/Makefile.am          |    5 +++--
 xlators/features/quota/src/Makefile.am            |    5 +++--
 xlators/features/read-only/src/Makefile.am        |    5 +++--
 xlators/features/trash/src/Makefile.am            |    5 +++--
 xlators/meta/src/Makefile.am                      |    5 +++--
 xlators/mgmt/glusterd/src/Makefile.am             |    7 ++++---
 xlators/mount/fuse/src/Makefile.am                |    5 +++--
 xlators/nfs/server/src/Makefile.am                |    6 ++++--
 xlators/performance/io-cache/src/Makefile.am      |    6 ++++--
 xlators/performance/io-threads/src/Makefile.am    |    5 +++--
 xlators/performance/md-cache/src/Makefile.am      |    6 ++++--
 xlators/performance/quick-read/src/Makefile.am    |    5 +++--
 xlators/performance/read-ahead/src/Makefile.am    |    5 +++--
 xlators/performance/symlink-cache/src/Makefile.am |    5 +++--
 xlators/performance/write-behind/src/Makefile.am  |    5 +++--
 xlators/protocol/auth/addr/src/Makefile.am        |    6 ++++--
 xlators/protocol/auth/login/src/Makefile.am       |    5 +++--
 xlators/protocol/client/src/Makefile.am           |    6 ++++--
 xlators/protocol/server/src/Makefile.am           |    6 ++++--
 xlators/storage/posix/src/Makefile.am             |    7 ++++---
 xlators/system/posix-acl/src/Makefile.am          |    5 +++--
 45 files changed, 151 insertions(+), 92 deletions(-)

diff --git a/api/src/Makefile.am b/api/src/Makefile.am
index a791239..954a71f 100644
--- a/api/src/Makefile.am
+++ b/api/src/Makefile.am
@@ -9,7 +9,7 @@ libgfapi_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la \
        $(top_builddir)/rpc/xdr/src/libgfxdr.la \
        $(GF_LDADD)
 
-libgfapi_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 $(GF_CFLAGS) \
+libgfapi_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \
        -I$(top_srcdir)/libglusterfs/src \
        -I$(top_srcdir)/rpc/rpc-lib/src \
        -I$(top_srcdir)/rpc/xdr/src
@@ -22,5 +22,6 @@ api_la_SOURCES = glfs-master.c
 api_la_LDFLAGS = -module -avoidversion
 api_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-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)
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index b58fe37..8b5a505 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:
diff --git a/contrib/fuse-util/Makefile.am b/contrib/fuse-util/Makefile.am
index 0691e57..971d3d2 100644
--- a/contrib/fuse-util/Makefile.am
+++ b/contrib/fuse-util/Makefile.am
@@ -3,7 +3,9 @@ bin_PROGRAMS = fusermount-glusterfs
 fusermount_glusterfs_SOURCES = fusermount.c mount_util.c 
$(CONTRIBDIR)/fuse-lib/mount-common.c
 noinst_HEADERS = $(CONTRIBDIR)/fuse-include/mount_util.h
 
-AM_CFLAGS = -Wall $(GF_CPPFLAGS) -DFUSE_UTIL $(GF_CFLAGS) 
-I$(CONTRIBDIR)/fuse-include
+AM_CPPFLAGS = $(GF_CPPFLAGS) -DFUSE_UTIL -I$(CONTRIBDIR)/fuse-include
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
 
 install-exec-hook:
        -chown root $(DESTDIR)$(bindir)/fusermount-glusterfs
diff --git a/glusterfsd/src/Makefile.am b/glusterfsd/src/Makefile.am
index 97a64df..541a4d9 100644
--- a/glusterfsd/src/Makefile.am
+++ b/glusterfsd/src/Makefile.am
@@ -8,11 +8,13 @@ glusterfsd_LDADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la \
 glusterfsd_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS)
 noinst_HEADERS = glusterfsd.h glusterfsd-mem-types.h
 
-AM_CFLAGS = -Wall $(GF_CPPFLAGS) \
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
        -I$(top_srcdir)/libglusterfs/src -DDATADIR=\"$(localstatedir)\" \
-       -DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS) \
+       -DCONFDIR=\"$(sysconfdir)/glusterfs\" \
        -I$(top_srcdir)/rpc/rpc-lib/src -I$(top_srcdir)/rpc/xdr/src
 
+AM_CFLAGS = -Wall $(GF_GLUSTERFS_CFLAGS)
+
 CLEANFILES = 
 
 $(top_builddir)/libglusterfs/src/libglusterfs.la:
diff --git a/rpc/rpc-lib/src/Makefile.am b/rpc/rpc-lib/src/Makefile.am
index effdab2..ca62a27 100644
--- a/rpc/rpc-lib/src/Makefile.am
+++ b/rpc/rpc-lib/src/Makefile.am
@@ -8,9 +8,10 @@ libgfrpc_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h 
\
        rpc-clnt.h rpcsvc-common.h protocol-common.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)/rpc/xdr/src \
        
-DRPC_TRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport\"
 
+AM_CFLAGS = -Wall $(GF_CFLAGS)
+
 CLEANFILES = *~
diff --git a/rpc/rpc-transport/rdma/src/Makefile.am 
b/rpc/rpc-transport/rdma/src/Makefile.am
index 6726b6b..2211f1f 100644
--- a/rpc/rpc-transport/rdma/src/Makefile.am
+++ b/rpc/rpc-transport/rdma/src/Makefile.am
@@ -11,8 +11,10 @@ rdma_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la     \
 
 noinst_HEADERS = rdma.h name.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
        -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \
-       -I$(top_srcdir)/rpc/xdr/src $(GF_CFLAGS)
+       -I$(top_srcdir)/rpc/xdr/src
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
 
 CLEANFILES = *~
diff --git a/rpc/rpc-transport/socket/src/Makefile.am 
b/rpc/rpc-transport/socket/src/Makefile.am
index a1e379c..f1f256d 100644
--- a/rpc/rpc-transport/socket/src/Makefile.am
+++ b/rpc/rpc-transport/socket/src/Makefile.am
@@ -8,8 +8,10 @@ socket_la_LDFLAGS = -module -avoidversion -lssl
 socket_la_SOURCES = socket.c name.c
 socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
        -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \
-       -I$(top_srcdir)/rpc/xdr/src/ $(GF_CFLAGS)
+       -I$(top_srcdir)/rpc/xdr/src/
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
 
 CLEANFILES = *~
diff --git a/xlators/bindings/python/src/Makefile.am 
b/xlators/bindings/python/src/Makefile.am
index 3a99454..809d2a8 100644
--- a/xlators/bindings/python/src/Makefile.am
+++ b/xlators/bindings/python/src/Makefile.am
@@ -9,10 +9,12 @@ pythondir = $(xlatordir)/python
 
 python_so_SOURCES = python.c
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
        -I$(top_srcdir)/libglusterfs/src \
        $(PYTHON_CPPFLAGS) -DGLUSTER_PYTHON_PATH=\"$(pythondir)\"
 
+AM_CFLAGS = -Wall
+
 AM_LDFLAGS = $(PYTHON_LDFLAGS)
 
 CLEANFILES = 
diff --git a/xlators/cluster/afr/src/Makefile.am 
b/xlators/cluster/afr/src/Makefile.am
index c2a9110..ef6bf97 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 905340d..b78af1f 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 d047b07..c5da56f 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 9d02f1b..a51c135 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 0ab5193..42846df 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 = 
 
diff --git a/xlators/debug/error-gen/src/Makefile.am 
b/xlators/debug/error-gen/src/Makefile.am
index c23ad62..2de2372 100644
--- a/xlators/debug/error-gen/src/Makefile.am
+++ b/xlators/debug/error-gen/src/Makefile.am
@@ -9,8 +9,9 @@ error_gen_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = error-gen.h error-gen-mem-types.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/debug/io-stats/src/Makefile.am 
b/xlators/debug/io-stats/src/Makefile.am
index b18c88b..08d2611 100644
--- a/xlators/debug/io-stats/src/Makefile.am
+++ b/xlators/debug/io-stats/src/Makefile.am
@@ -9,7 +9,8 @@ io_stats_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = io-stats-mem-types.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/debug/trace/src/Makefile.am 
b/xlators/debug/trace/src/Makefile.am
index d3016e0..eb6434a 100644
--- a/xlators/debug/trace/src/Makefile.am
+++ b/xlators/debug/trace/src/Makefile.am
@@ -7,8 +7,9 @@ trace_la_LDFLAGS = -module -avoidversion
 trace_la_SOURCES = trace.c
 trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-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/encryption/rot-13/src/Makefile.am 
b/xlators/encryption/rot-13/src/Makefile.am
index 1bbcff9..91c9d93 100644
--- a/xlators/encryption/rot-13/src/Makefile.am
+++ b/xlators/encryption/rot-13/src/Makefile.am
@@ -8,7 +8,8 @@ rot_13_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = rot-13.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/features/filter/src/Makefile.am 
b/xlators/features/filter/src/Makefile.am
index 74eda55..a9f8073 100644
--- a/xlators/features/filter/src/Makefile.am
+++ b/xlators/features/filter/src/Makefile.am
@@ -8,8 +8,9 @@ filter_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = filter-mem-types.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/features/index/src/Makefile.am 
b/xlators/features/index/src/Makefile.am
index 64a7239..a550c1f 100644
--- a/xlators/features/index/src/Makefile.am
+++ b/xlators/features/index/src/Makefile.am
@@ -8,8 +8,10 @@ index_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = index.h index-mem-types.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
        -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/xdr/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/features/locks/src/Makefile.am 
b/xlators/features/locks/src/Makefile.am
index 5503ded..0fdaaf6 100644
--- a/xlators/features/locks/src/Makefile.am
+++ b/xlators/features/locks/src/Makefile.am
@@ -9,9 +9,9 @@ locks_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = locks.h common.h locks-mem-types.h clear.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
-       -fno-strict-aliasing \
-       -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS)
+AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
+
+AM_CFLAGS = -Wall -fno-strict-aliasing $(GF_CFLAGS)
 
 CLEANFILES = 
 
diff --git a/xlators/features/mac-compat/src/Makefile.am 
b/xlators/features/mac-compat/src/Makefile.am
index b9e9689..3ba7125 100644
--- a/xlators/features/mac-compat/src/Makefile.am
+++ b/xlators/features/mac-compat/src/Makefile.am
@@ -6,8 +6,9 @@ mac_compat_la_LDFLAGS = -module -avoidversion
 mac_compat_la_SOURCES = mac-compat.c
 mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-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/features/marker/src/Makefile.am 
b/xlators/features/marker/src/Makefile.am
index 0f727c9..5c350b6 100644
--- a/xlators/features/marker/src/Makefile.am
+++ b/xlators/features/marker/src/Makefile.am
@@ -8,8 +8,10 @@ marker_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = marker-mem-types.h marker.h marker-quota.h 
marker-quota-helper.h marker-common.h 
$(top_builddir)/xlators/lib/src/libxlator.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall -fno-strict-aliasing \
-        -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src 
$(GF_CFLAGS)
+AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+       -I$(top_srcdir)/xlators/lib/src
+
+AM_CFLAGS = -Wall -fno-strict-aliasing $(GF_CFLAGS)
 
 CLEANFILES =
 
diff --git a/xlators/features/marker/utils/src/Makefile.am 
b/xlators/features/marker/utils/src/Makefile.am
index 15542dc..fd5a4f8 100644
--- a/xlators/features/marker/utils/src/Makefile.am
+++ b/xlators/features/marker/utils/src/Makefile.am
@@ -10,11 +10,12 @@ gsyncd_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS)
 
 noinst_HEADERS = procdiggy.h
 
-AM_CFLAGS = -Wall $(GF_CPPFLAGS) \
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
        -I$(top_srcdir)/libglusterfs/src\
        -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
-       -DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\" $(GF_CFLAGS)
+       -DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\"
 
+AM_CFLAGS = -Wall $(GF_CFLAGS)
 
 CLEANFILES =
 
diff --git a/xlators/features/path-convertor/src/Makefile.am 
b/xlators/features/path-convertor/src/Makefile.am
index f40d89c..f111275 100644
--- a/xlators/features/path-convertor/src/Makefile.am
+++ b/xlators/features/path-convertor/src/Makefile.am
@@ -7,8 +7,9 @@ path_converter_la_LDFLAGS = -module -avoidversion
 path_converter_la_SOURCES = path.c
 path_converter_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la 
 
-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/features/quiesce/src/Makefile.am 
b/xlators/features/quiesce/src/Makefile.am
index bece5b0..ee6e29b 100644
--- a/xlators/features/quiesce/src/Makefile.am
+++ b/xlators/features/quiesce/src/Makefile.am
@@ -8,7 +8,8 @@ quiesce_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = quiesce.h quiesce-mem-types.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/features/quota/src/Makefile.am 
b/xlators/features/quota/src/Makefile.am
index e725589..6c97e75 100644
--- a/xlators/features/quota/src/Makefile.am
+++ b/xlators/features/quota/src/Makefile.am
@@ -8,9 +8,10 @@ quota_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = quota-mem-types.h quota.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/cluster/dht/src
 
+AM_CFLAGS = -Wall $(GF_CFLAGS)
+
 CLEANFILES = 
 
diff --git a/xlators/features/read-only/src/Makefile.am 
b/xlators/features/read-only/src/Makefile.am
index 5c01365..aa41122 100644
--- a/xlators/features/read-only/src/Makefile.am
+++ b/xlators/features/read-only/src/Makefile.am
@@ -14,8 +14,9 @@ worm_la_LDFLAGS = -module -avoidversion
 worm_la_SOURCES = read-only-common.c worm.c
 worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-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/features/trash/src/Makefile.am 
b/xlators/features/trash/src/Makefile.am
index 2470f7d..4541e69 100644
--- a/xlators/features/trash/src/Makefile.am
+++ b/xlators/features/trash/src/Makefile.am
@@ -8,8 +8,9 @@ trash_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = trash.h trash-mem-types.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/meta/src/Makefile.am b/xlators/meta/src/Makefile.am
index 11a5342..f8fa7d4 100644
--- a/xlators/meta/src/Makefile.am
+++ b/xlators/meta/src/Makefile.am
@@ -4,7 +4,8 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/
 meta_so_SOURCES = meta.c tree.c misc.c view.c
 noinst_HEADERS = meta.h tree.h misc.h view.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
-       -I$(top_srcdir)/libglusterfs/src
+AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
+
+AM_CFLAGS = -Wall
 
 CLEANFILES = 
diff --git a/xlators/mgmt/glusterd/src/Makefile.am 
b/xlators/mgmt/glusterd/src/Makefile.am
index f00d7a4..de65c39 100644
--- a/xlators/mgmt/glusterd/src/Makefile.am
+++ b/xlators/mgmt/glusterd/src/Makefile.am
@@ -1,6 +1,6 @@
 xlator_LTLIBRARIES = glusterd.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt
-glusterd_la_CPPFLAGS = $(GF_CPPFLAGS) 
"-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\""
+glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) 
"-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\""
 glusterd_la_LDFLAGS = -module -avoidversion $(LIBXML2_LIBS) -lcrypto
 glusterd_la_SOURCES = glusterd.c glusterd-handler.c glusterd-sm.c \
        glusterd-op-sm.c glusterd-utils.c glusterd-rpc-ops.c \
@@ -19,8 +19,7 @@ noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h 
\
        glusterd-pmap.h glusterd-volgen.h glusterd-mountbroker.h \
        glusterd-syncop.h glusterd-hooks.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
-       -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS)\
+AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
        -I$(rpclibdir) -I$(CONTRIBDIR)/rbtree \
        -I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \
        -I$(CONTRIBDIR)/uuid \
@@ -28,6 +27,8 @@ AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
        -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
         -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(LIBXML2_CFLAGS)
 
+AM_CFLAGS = -Wall $(GF_CFLAGS)
+
 AM_LDFLAGS = -L$(xlatordir)
 
 CLEANFILES =
diff --git a/xlators/mount/fuse/src/Makefile.am 
b/xlators/mount/fuse/src/Makefile.am
index 97a68b8..4e92870 100644
--- a/xlators/mount/fuse/src/Makefile.am
+++ b/xlators/mount/fuse/src/Makefile.am
@@ -27,9 +27,10 @@ fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c 
fuse-bridge.c \
 fuse_la_LDFLAGS = -module -avoidversion
 fuse_la_LIBADD = @GF_FUSE_LDADD@
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
        -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/fuse-include \
-       -I$(CONTRIBDIR)/fuse-lib $(GF_CFLAGS) $(GF_FUSE_CFLAGS)
+       -I$(CONTRIBDIR)/fuse-lib $(GF_FUSE_CFLAGS)
 
+AM_CFLAGS = -Wall $(GF_CFLAGS)
 
 CLEANFILES =
diff --git a/xlators/nfs/server/src/Makefile.am 
b/xlators/nfs/server/src/Makefile.am
index 98fcc58..e224896 100644
--- a/xlators/nfs/server/src/Makefile.am
+++ b/xlators/nfs/server/src/Makefile.am
@@ -10,12 +10,14 @@ server_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 noinst_HEADERS = nfs.h nfs-common.h nfs-fops.h nfs-inodes.h nfs-generics.h \
        mount3.h nfs3-fh.h nfs3.h nfs3-helpers.h nfs-mem-types.h nlm4.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
        -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" \
-       -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS)\
+       -I$(top_srcdir)/libglusterfs/src \
        -I$(nfsrpclibdir) -I$(CONTRIBDIR)/rbtree\
        -I$(top_srcdir)/rpc/xdr/src/
 
+AM_CFLAGS = -Wall $(GF_CFLAGS)
+
 AM_LDFLAGS = -L$(xlatordir)
 
 CLEANFILES =
diff --git a/xlators/performance/io-cache/src/Makefile.am 
b/xlators/performance/io-cache/src/Makefile.am
index 0ad90f0..838e5f5 100644
--- a/xlators/performance/io-cache/src/Makefile.am
+++ b/xlators/performance/io-cache/src/Makefile.am
@@ -8,7 +8,9 @@ io_cache_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = io-cache.h ioc-mem-types.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
-       -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/rbtree $(GF_CFLAGS)
+AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+       -I$(CONTRIBDIR)/rbtree
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
 
 CLEANFILES = 
diff --git a/xlators/performance/io-threads/src/Makefile.am 
b/xlators/performance/io-threads/src/Makefile.am
index d250fe2..0f5a3b1 100644
--- a/xlators/performance/io-threads/src/Makefile.am
+++ b/xlators/performance/io-threads/src/Makefile.am
@@ -8,7 +8,8 @@ io_threads_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = io-threads.h iot-mem-types.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/performance/md-cache/src/Makefile.am 
b/xlators/performance/md-cache/src/Makefile.am
index 3f7aabc..bd09c15 100644
--- a/xlators/performance/md-cache/src/Makefile.am
+++ b/xlators/performance/md-cache/src/Makefile.am
@@ -8,8 +8,10 @@ md_cache_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = md-cache-mem-types.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
-       -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/rbtree $(GF_CFLAGS)
+AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+       -I$(CONTRIBDIR)/rbtree
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
 
 CLEANFILES =
 
diff --git a/xlators/performance/quick-read/src/Makefile.am 
b/xlators/performance/quick-read/src/Makefile.am
index 89e2d38..790f1e9 100644
--- a/xlators/performance/quick-read/src/Makefile.am
+++ b/xlators/performance/quick-read/src/Makefile.am
@@ -8,7 +8,8 @@ quick_read_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = quick-read.h quick-read-mem-types.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/performance/read-ahead/src/Makefile.am 
b/xlators/performance/read-ahead/src/Makefile.am
index da06c33..ae2b1ac 100644
--- a/xlators/performance/read-ahead/src/Makefile.am
+++ b/xlators/performance/read-ahead/src/Makefile.am
@@ -8,7 +8,8 @@ read_ahead_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = read-ahead.h read-ahead-mem-types.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/performance/symlink-cache/src/Makefile.am 
b/xlators/performance/symlink-cache/src/Makefile.am
index 763d781..c37d93e 100644
--- a/xlators/performance/symlink-cache/src/Makefile.am
+++ b/xlators/performance/symlink-cache/src/Makefile.am
@@ -6,7 +6,8 @@ symlink_cache_la_LDFLAGS = -module -avoidversion
 symlink_cache_la_SOURCES = symlink-cache.c
 symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-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/performance/write-behind/src/Makefile.am 
b/xlators/performance/write-behind/src/Makefile.am
index 9b9db3b..5ca0462 100644
--- a/xlators/performance/write-behind/src/Makefile.am
+++ b/xlators/performance/write-behind/src/Makefile.am
@@ -8,7 +8,8 @@ write_behind_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = write-behind-mem-types.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/protocol/auth/addr/src/Makefile.am 
b/xlators/protocol/auth/addr/src/Makefile.am
index d7d4e4b..1b88e0c 100644
--- a/xlators/protocol/auth/addr/src/Makefile.am
+++ b/xlators/protocol/auth/addr/src/Makefile.am
@@ -6,7 +6,9 @@ addr_la_LDFLAGS = -module -avoidversion
 addr_la_SOURCES = addr.c
 addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-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/protocol/server/src \
        -I$(top_srcdir)/rpc/rpc-lib/src/
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
diff --git a/xlators/protocol/auth/login/src/Makefile.am 
b/xlators/protocol/auth/login/src/Makefile.am
index e1a47c6..8a424ba 100644
--- a/xlators/protocol/auth/login/src/Makefile.am
+++ b/xlators/protocol/auth/login/src/Makefile.am
@@ -6,6 +6,7 @@ login_la_LDFLAGS = -module -avoidversion
 login_la_SOURCES = login.c
 login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-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/protocol/server/src
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
diff --git a/xlators/protocol/client/src/Makefile.am 
b/xlators/protocol/client/src/Makefile.am
index a02aa07..7eed689 100644
--- a/xlators/protocol/client/src/Makefile.am
+++ b/xlators/protocol/client/src/Makefile.am
@@ -13,6 +13,8 @@ client_la_SOURCES = client.c client-helpers.c 
client-rpc-fops.c  \
 
 noinst_HEADERS = client.h client-mem-types.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)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src/
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
diff --git a/xlators/protocol/server/src/Makefile.am 
b/xlators/protocol/server/src/Makefile.am
index 2e94dcb..c7ac381 100644
--- a/xlators/protocol/server/src/Makefile.am
+++ b/xlators/protocol/server/src/Makefile.am
@@ -12,12 +12,14 @@ server_la_SOURCES = server.c server-resolve.c 
server-helpers.c  \
 
 noinst_HEADERS = server.h server-helpers.h server-mem-types.h authenticate.h
 
-AM_CFLAGS = $(GF_CPPFLAGS) -Wall \
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
        -I$(top_srcdir)/libglusterfs/src \
        -DCONFDIR=\"$(sysconfdir)/glusterfs\" \
        -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" \
-       $(GF_CFLAGS) -I$(top_srcdir)/xlators/protocol/lib/src   \
+       -I$(top_srcdir)/xlators/protocol/lib/src   \
        -I$(top_srcdir)/rpc/rpc-lib/src/       \
        -I$(top_srcdir)/rpc/xdr/src/
 
+AM_CFLAGS = -Wall $(GF_CFLAGS)
+
 CLEANFILES = *~
diff --git a/xlators/storage/posix/src/Makefile.am 
b/xlators/storage/posix/src/Makefile.am
index 85d72a1..03623cf 100644
--- a/xlators/storage/posix/src/Makefile.am
+++ b/xlators/storage/posix/src/Makefile.am
@@ -9,10 +9,11 @@ posix_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO)
 
 noinst_HEADERS = posix.h posix-mem-types.h posix-handle.h posix-aio.h
 
-AM_CFLAGS = -fno-strict-aliasing $(GF_CPPFLAGS) \
-            -Wall -I$(top_srcdir)/libglusterfs/src \
+AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
             -I$(top_srcdir)/rpc/xdr/src \
-            -I$(top_srcdir)/rpc/rpc-lib/src $(GF_CFLAGS)
+            -I$(top_srcdir)/rpc/rpc-lib/src
+
+AM_CFLAGS = -fno-strict-aliasing -Wall $(GF_CFLAGS)
 
 CLEANFILES =
 
diff --git a/xlators/system/posix-acl/src/Makefile.am 
b/xlators/system/posix-acl/src/Makefile.am
index 200717f..15890f9 100644
--- a/xlators/system/posix-acl/src/Makefile.am
+++ b/xlators/system/posix-acl/src/Makefile.am
@@ -6,8 +6,9 @@ posix_acl_la_LIBADD = 
$(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = posix-acl.h posix-acl-xattr.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)
 
 AM_LDFLAGS = -L$(xlatordir)
 
-- 
1.7.10.4
[Prev in Thread]
Current Thread
[Next in Thread]
[Gluster-devel] [PATCH 15/15] build: make use of system libuuid, (continued)
- [Gluster-devel] [PATCH 15/15] build: make use of system libuuid, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 12/15] build: move -L arguments out of CFLAGS, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 09/15] build: remove two no-op lines from rdma Makefile, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 08/15] build: fix a typo in the python xlator Makefile, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 04/15] init.d: use proper dependencies in SUSE init script, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 11/15] build: remove useless explicit -fPIC -shared from CFLAGS, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 14/15] build: libraries must be in LDADD/LIBADD, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 02/15] build: add missing backslash in api/src/, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 10/15] build: remove -nostartfiles flag, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 06/15] build: consolidate common compilation flags into one variable, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 13/15] build: split CPPFLAGS from CFLAGS, Jan Engelhardt <=
- Re: [Gluster-devel] Build system cleanups (v2), Anand Avati, 2012/09/25
  - Re: [Gluster-devel] Build system cleanups (v2), Jeff Darcy, 2012/09/25
Prev by Date: [Gluster-devel] [PATCH 06/15] build: consolidate common compilation flags into one variable
Next by Date: Re: [Gluster-devel] Build system cleanups (v2)
Previous by thread: [Gluster-devel] [PATCH 06/15] build: consolidate common compilation flags into one variable
Next by thread: Re: [Gluster-devel] Build system cleanups (v2)
Index(es):
- Date
- Thread