From b9f76b7179cfa3fb65b6e25b85a5458eeeb88bb5 Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Mon, 1 Oct 2012 15:57:41 -0400 Subject: build: add missing GF_CFLAGS in api/src/ 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. Change-Id: I50c22f16210ecd40371d4abb0e418c7a4f94c12f BUG: 862082 Original-author: Jan Engelhardt Signed-off-by: Jan Engelhardt Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.org/4009 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- 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 f5fb9e70..8996c075 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 de23fb55..e44ffb5b 100644 --- a/xlators/features/marker/utils/src/Makefile.am +++ b/xlators/features/marker/utils/src/Makefile.am @@ -14,7 +14,7 @@ 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\"\ -DUSE_LIBGLUSTERFS\ - -DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\" + -DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\" $(GF_CFLAGS) CLEANFILES = -- cgit