From 1ecbb7ca68bd39ede792414b21a772469ecb4094 Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Wed, 3 Oct 2012 09:30:27 -0400 Subject: build: remove useless explicit -fPIC -shared from CFLAGS libtool will automatically add "-fPIC" to the compiler command line as needed, so there is no need to specify it separately. "-shared" is normally a linker flag and has an odd effect when used with libtool --mode=compile, namely that it inhibits production of static objects. For that however, using AC_DISABLE_STATIC is a lot simpler. Change-Id: Ic4cba0fad18ffd985cf07f8d6951a976ae59a48f BUG: 862082 Original-author: Jan Engelhardt Signed-off-by: Jan Engelhardt Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.org/4027 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- xlators/features/filter/src/Makefile.am | 4 ++-- xlators/features/index/src/Makefile.am | 4 ++-- xlators/features/locks/src/Makefile.am | 4 ++-- xlators/features/mac-compat/src/Makefile.am | 4 ++-- xlators/features/marker/src/Makefile.am | 4 ++-- xlators/features/marker/utils/src/Makefile.am | 2 +- xlators/features/path-convertor/src/Makefile.am | 4 ++-- xlators/features/quiesce/src/Makefile.am | 4 ++-- xlators/features/quota/src/Makefile.am | 4 ++-- xlators/features/read-only/src/Makefile.am | 4 ++-- xlators/features/trash/src/Makefile.am | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) (limited to 'xlators/features') diff --git a/xlators/features/filter/src/Makefile.am b/xlators/features/filter/src/Makefile.am index 1b64e70043b..74eda5536af 100644 --- a/xlators/features/filter/src/Makefile.am +++ b/xlators/features/filter/src/Makefile.am @@ -8,8 +8,8 @@ filter_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = filter-mem-types.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -shared $(GF_CFLAGS) +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am index f8bc0f72470..64a7239321b 100644 --- a/xlators/features/index/src/Makefile.am +++ b/xlators/features/index/src/Makefile.am @@ -8,8 +8,8 @@ index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = index.h index-mem-types.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/xdr/src \ - -I$(top_srcdir)/rpc/rpc-lib/src -shared $(GF_CFLAGS) + -I$(top_srcdir)/rpc/rpc-lib/src $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am index c259170d4e1..5503dedb2a8 100644 --- a/xlators/features/locks/src/Makefile.am +++ b/xlators/features/locks/src/Makefile.am @@ -9,9 +9,9 @@ locks_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = locks.h common.h locks-mem-types.h clear.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -fno-strict-aliasing \ - -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) -shared + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am index c2ef424e829..b9e96896a9d 100644 --- a/xlators/features/mac-compat/src/Makefile.am +++ b/xlators/features/mac-compat/src/Makefile.am @@ -6,8 +6,8 @@ mac_compat_la_LDFLAGS = -module -avoidversion mac_compat_la_SOURCES = mac-compat.c mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -shared $(GF_CFLAGS) +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am index 6301bd4e7d6..0f727c9e27f 100644 --- a/xlators/features/marker/src/Makefile.am +++ b/xlators/features/marker/src/Makefile.am @@ -8,8 +8,8 @@ marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = marker-mem-types.h marker.h marker-quota.h marker-quota-helper.h marker-common.h $(top_builddir)/xlators/lib/src/libxlator.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall -fno-strict-aliasing \ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src $(GF_CFLAGS) -shared +AM_CFLAGS = $(GF_CPPFLAGS) -Wall -fno-strict-aliasing \ + -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/features/marker/utils/src/Makefile.am b/xlators/features/marker/utils/src/Makefile.am index f51387f9113..0f50b8e29d4 100644 --- a/xlators/features/marker/utils/src/Makefile.am +++ b/xlators/features/marker/utils/src/Makefile.am @@ -10,7 +10,7 @@ gsyncd_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS) noinst_HEADERS = procdiggy.h -AM_CFLAGS = -fPIC -Wall $(GF_CPPFLAGS) \ +AM_CFLAGS = -Wall $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src\ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ -DUSE_LIBGLUSTERFS\ diff --git a/xlators/features/path-convertor/src/Makefile.am b/xlators/features/path-convertor/src/Makefile.am index a9a3e8939cc..f40d89cebca 100644 --- a/xlators/features/path-convertor/src/Makefile.am +++ b/xlators/features/path-convertor/src/Makefile.am @@ -7,8 +7,8 @@ path_converter_la_LDFLAGS = -module -avoidversion path_converter_la_SOURCES = path.c path_converter_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -shared $(GF_CFLAGS) +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am index aeb01e3f4ec..bece5b05e37 100644 --- a/xlators/features/quiesce/src/Makefile.am +++ b/xlators/features/quiesce/src/Makefile.am @@ -8,7 +8,7 @@ quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = quiesce.h quiesce-mem-types.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -shared $(GF_CFLAGS) +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am index 96f6317a644..e7255895071 100644 --- a/xlators/features/quota/src/Makefile.am +++ b/xlators/features/quota/src/Makefile.am @@ -8,8 +8,8 @@ quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = quota-mem-types.h quota.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -shared $(GF_CFLAGS) \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) \ -I$(top_srcdir)/xlators/cluster/dht/src CLEANFILES = diff --git a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am index a80ed85dcba..5c013655abe 100644 --- a/xlators/features/read-only/src/Makefile.am +++ b/xlators/features/read-only/src/Makefile.am @@ -14,8 +14,8 @@ worm_la_LDFLAGS = -module -avoidversion worm_la_SOURCES = read-only-common.c worm.c worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -shared $(GF_CFLAGS) +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/features/trash/src/Makefile.am b/xlators/features/trash/src/Makefile.am index bc757f3bdcd..2470f7d9ec9 100644 --- a/xlators/features/trash/src/Makefile.am +++ b/xlators/features/trash/src/Makefile.am @@ -8,8 +8,8 @@ trash_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = trash.h trash-mem-types.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -shared $(GF_CFLAGS) +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) CLEANFILES = -- cgit