From 9059a76c67f0e3157c02b3de4b8f9339981e7c23 Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Mon, 1 Oct 2012 16:09:26 -0400 Subject: 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 Signed-off-by: Jan Engelhardt Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.org/4013 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- xlators/debug/error-gen/src/Makefile.am | 2 +- xlators/debug/io-stats/src/Makefile.am | 2 +- xlators/debug/trace/src/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/debug') diff --git a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am index df9080358..aa12196f2 100644 --- a/xlators/debug/error-gen/src/Makefile.am +++ b/xlators/debug/error-gen/src/Makefile.am @@ -9,7 +9,7 @@ error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = error-gen.h error-gen-mem-types.h -AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ +AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am index b894e79c3..542adbcf4 100644 --- a/xlators/debug/io-stats/src/Makefile.am +++ b/xlators/debug/io-stats/src/Makefile.am @@ -9,7 +9,7 @@ io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = io-stats-mem-types.h -AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ +AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am index 0f1679a04..c4e193ee5 100644 --- a/xlators/debug/trace/src/Makefile.am +++ b/xlators/debug/trace/src/Makefile.am @@ -7,7 +7,7 @@ trace_la_LDFLAGS = -module -avoidversion trace_la_SOURCES = trace.c trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ +AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) CLEANFILES = -- cgit