[Gluster-devel] [PATCH 01/15] build: add missing GF_CFLAGS in api/src/

[Jan Engelhardt]

GF_CFLAGS seems missing in two spots.

In one of those, adding it to libgfapi_la_CFLAGS would make it equal
to AM_CFLAGS, so remove libgfapi_la_CFLAGS there.

Signed-off-by: Jan Engelhardt <jengelh at inai.de>
---
 api/src/Makefile.am                           |    1 -
 xlators/features/marker/utils/src/Makefile.am |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/api/src/Makefile.am b/api/src/Makefile.am
index f5fb9e7..8996c07 100644
--- a/api/src/Makefile.am
+++ b/api/src/Makefile.am
@@ -4,7 +4,6 @@ libgfapi_HEADERS = glfs.h
 libgfapidir = $(includedir)/glusterfs/api
 
 libgfapi_la_SOURCES = glfs.c glfs-mgmt.c glfs-fops.c glfs-resolve.c
-libgfapi_la_CFLAGS = -fPIC -Wall
 libgfapi_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
 	$(top_builddir)/rpc/xdr/src/libgfxdr.la \
diff --git a/xlators/features/marker/utils/src/Makefile.am b/xlators/features/marker/utils/src/Makefile.am
index 73c99cb..0f7b604 100644
--- a/xlators/features/marker/utils/src/Makefile.am
+++ b/xlators/features/marker/utils/src/Makefile.am
@@ -13,7 +13,7 @@ noinst_HEADERS = procdiggy.h
 AM_CFLAGS = -fPIC -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\
 	-I$(top_srcdir)/libglusterfs/src\
 	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
-	-DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\"
+	-DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\" $(GF_CFLAGS)
 
 
 CLEANFILES =
-- 
1.7.10.4