summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2012-10-01 16:09:26 -0400
committerAnand Avati <avati@redhat.com>2012-10-01 16:44:50 -0700
commit9059a76c67f0e3157c02b3de4b8f9339981e7c23 (patch)
tree7dfbcda51fe0f73b4914da054398ed2c84dd1e1f /api
parentb9f76b7179cfa3fb65b6e25b85a5458eeeb88bb5 (diff)
build: consolidate common compilation flags into one variable
Some -D flags are present in all files, so collect them. This adds -D${GF_HOST_OS} to some compiler command lines, but this should not be a problem. Change-Id: I1aeb346143d4984c9cc4f2750c465ce09af1e6ca BUG: 862082 Original-author: Jan Engelhardt <jengelh@inai.de> Signed-off-by: Jan Engelhardt <jengelh@inai.de> Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/4013 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'api')
-rw-r--r--api/src/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/api/src/Makefile.am b/api/src/Makefile.am
index 8996c0756..03a27bd05 100644
--- a/api/src/Makefile.am
+++ b/api/src/Makefile.am
@@ -9,8 +9,7 @@ libgfapi_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
$(top_builddir)/rpc/xdr/src/libgfxdr.la \
$(GF_LDADD)
-libgfapi_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE \
- -D$(GF_HOST_OS) $(GF_CFLAGS) \
+libgfapi_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 $(GF_CFLAGS) \
-I$(top_srcdir)/libglusterfs/src \
-I$(top_srcdir)/rpc/rpc-lib/src \
-I$(top_srcdir)/rpc/xdr/src
@@ -25,5 +24,5 @@ api_la_SOURCES = glfs-master.c
api_la_LDFLAGS = -module -avoidversion
api_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) -Wall \
+AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \
-I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS)