[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gluster-devel] [PATCH 01/15] build: add missing GF_CFLAGS in api/src/
From: |
Jan Engelhardt |
Subject: |
[Gluster-devel] [PATCH 01/15] build: add missing GF_CFLAGS in api/src/ |
Date: |
Tue, 25 Sep 2012 18:40:59 +0200 |
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 <address@hidden>
---
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
- [Gluster-devel] Build system cleanups (v2), Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 05/15] init.d: implement reload action for SUSE init script, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 07/15] build: replace INCLUDES by CPPFLAGS, Jan Engelhardt, 2012/09/25
- [Gluster-devel] [PATCH 01/15] build: add missing GF_CFLAGS in api/src/,
Jan Engelhardt <=
- [Gluster-devel] [PATCH 03/15] build: more efficient clean, Jan Engelhardt, 2012/09/25
- [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