diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2012-10-03 09:30:27 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-10-03 12:24:59 -0700 |
| commit | 1ecbb7ca68bd39ede792414b21a772469ecb4094 (patch) | |
| tree | b54d1e8b7c54e6f9a03cf7ef0452c61582ba81d5 | |
| parent | ec79583cfd2ae10998dedfeb0c2c2a83a81cdec3 (diff) | |
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 <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/4027
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
46 files changed, 85 insertions, 86 deletions
diff --git a/api/src/Makefile.am b/api/src/Makefile.am index d96c87dbc05..a791239b53a 100644 --- a/api/src/Makefile.am +++ b/api/src/Makefile.am @@ -13,8 +13,6 @@ 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 -libgfapi_la_LDFLAGS = -shared - xlator_LTLIBRARIES = api.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount @@ -24,5 +22,5 @@ api_la_SOURCES = glfs-master.c api_la_LDFLAGS = -module -avoidversion api_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index f05011c9f9d..b58fe3725d5 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -11,7 +11,7 @@ gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD)\ gluster_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS) $(LIBXML2_LIBS) noinst_HEADERS = cli.h cli-mem-types.h cli-cmd.h -AM_CFLAGS = -fPIC -Wall $(GF_CPPFLAGS) \ +AM_CFLAGS = -Wall $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src\ -I$(top_srcdir)/rpc/xdr/src\ -DDATADIR=\"$(localstatedir)\" \ diff --git a/configure.ac b/configure.ac index 4f49fbf4230..9ab690a95f2 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,7 @@ AC_CONFIG_FILES([Makefile AC_CANONICAL_HOST AC_PROG_CC +AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_ARG_WITH(pkgconfigdir, diff --git a/glusterfsd/src/Makefile.am b/glusterfsd/src/Makefile.am index ede8a5b3bff..349ebc704b2 100644 --- a/glusterfsd/src/Makefile.am +++ b/glusterfsd/src/Makefile.am @@ -8,7 +8,7 @@ glusterfsd_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ glusterfsd_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS) noinst_HEADERS = glusterfsd.h glusterfsd-mem-types.h -AM_CFLAGS = -fPIC -Wall $(GF_CPPFLAGS) \ +AM_CFLAGS = -Wall $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src -DDATADIR=\"$(localstatedir)\" \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS) \ -I$(top_srcdir)/rpc/rpc-lib/src -I$(top_srcdir)/rpc/xdr/src diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index 4c7adea7f8e..6b55c645241 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -1,4 +1,4 @@ -libglusterfs_la_CFLAGS = -fPIC -Wall -shared $(GF_CFLAGS) \ +libglusterfs_la_CFLAGS = -Wall $(GF_CFLAGS) \ $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ diff --git a/rpc/rpc-lib/src/Makefile.am b/rpc/rpc-lib/src/Makefile.am index 466848b7a3f..effdab28d71 100644 --- a/rpc/rpc-lib/src/Makefile.am +++ b/rpc/rpc-lib/src/Makefile.am @@ -8,8 +8,8 @@ libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \ rpc-clnt.h rpcsvc-common.h protocol-common.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)/rpc/xdr/src \ -DRPC_TRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport\" diff --git a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am index 77c1f1bb724..eb2811076a5 100644 --- a/rpc/rpc-transport/rdma/src/Makefile.am +++ b/rpc/rpc-transport/rdma/src/Makefile.am @@ -13,8 +13,8 @@ noinst_HEADERS = rdma.h name.h -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \ -I$(top_srcdir)/xlators/protocol/lib/src/ -shared -nostartfiles $(GF_CFLAGS) -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \ - -I$(top_srcdir)/rpc/xdr/src -shared $(GF_CFLAGS) + -I$(top_srcdir)/rpc/xdr/src $(GF_CFLAGS) CLEANFILES = *~ diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am index 2d97ae48c05..a1e379c613a 100644 --- a/rpc/rpc-transport/socket/src/Makefile.am +++ b/rpc/rpc-transport/socket/src/Makefile.am @@ -8,8 +8,8 @@ socket_la_LDFLAGS = -module -avoidversion -lssl socket_la_SOURCES = socket.c name.c socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \ - -I$(top_srcdir)/rpc/xdr/src/ -shared $(GF_CFLAGS) + -I$(top_srcdir)/rpc/xdr/src/ $(GF_CFLAGS) CLEANFILES = *~ diff --git a/rpc/xdr/src/Makefile.am b/rpc/xdr/src/Makefile.am index d38456ee6f2..7d3d00093c1 100644 --- a/rpc/xdr/src/Makefile.am +++ b/rpc/xdr/src/Makefile.am @@ -1,6 +1,6 @@ lib_LTLIBRARIES = libgfxdr.la -libgfxdr_la_CFLAGS = -fPIC -Wall -shared $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) +libgfxdr_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) libgfxdr_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src diff --git a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am index 0dc554e1e93..c2a911064df 100644 --- a/xlators/cluster/afr/src/Makefile.am +++ b/xlators/cluster/afr/src/Makefile.am @@ -21,9 +21,9 @@ noinst_HEADERS = afr.h afr-transaction.h afr-inode-write.h afr-inode-read.h \ afr-self-heald.h $(top_builddir)/xlators/lib/src/libxlator.h \ $(top_builddir)/glusterfsd/src/glusterfsd.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/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/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am index 22f51343e9d..905340df2ea 100644 --- a/xlators/cluster/dht/src/Makefile.am +++ b/xlators/cluster/dht/src/Makefile.am @@ -24,8 +24,8 @@ switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = dht-common.h dht-mem-types.h \ $(top_builddir)/xlators/lib/src/libxlator.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/lib/src CLEANFILES = diff --git a/xlators/cluster/ha/src/Makefile.am b/xlators/cluster/ha/src/Makefile.am index 51e7f02d825..d047b073327 100644 --- a/xlators/cluster/ha/src/Makefile.am +++ b/xlators/cluster/ha/src/Makefile.am @@ -8,8 +8,8 @@ ha_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = ha.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/cluster/map/src/Makefile.am b/xlators/cluster/map/src/Makefile.am index f961f856165..9d02f1bdda9 100644 --- a/xlators/cluster/map/src/Makefile.am +++ b/xlators/cluster/map/src/Makefile.am @@ -8,8 +8,8 @@ map_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = map.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/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am index 8e9c0cf56d1..0ab5193a2e0 100644 --- a/xlators/cluster/stripe/src/Makefile.am +++ b/xlators/cluster/stripe/src/Makefile.am @@ -11,8 +11,8 @@ stripe_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = stripe.h stripe-mem-types.h $(top_builddir)/xlators/lib/src/libxlator.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/lib/src CLEANFILES = diff --git a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am index cef5254d5b8..c23ad62098a 100644 --- a/xlators/debug/error-gen/src/Makefile.am +++ b/xlators/debug/error-gen/src/Makefile.am @@ -9,8 +9,8 @@ error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = error-gen.h error-gen-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/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am index 2c82d57b490..b18c88be430 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 $(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/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am index b46174da2d7..d3016e09fa7 100644 --- a/xlators/debug/trace/src/Makefile.am +++ b/xlators/debug/trace/src/Makefile.am @@ -7,8 +7,8 @@ trace_la_LDFLAGS = -module -avoidversion trace_la_SOURCES = trace.c trace_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/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am index 9c48f3d9e61..1bbcff95f8c 100644 --- a/xlators/encryption/rot-13/src/Makefile.am +++ b/xlators/encryption/rot-13/src/Makefile.am @@ -8,7 +8,7 @@ rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = rot-13.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/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 = diff --git a/xlators/meta/src/Makefile.am b/xlators/meta/src/Makefile.am index 74c9014ce12..11a534261b2 100644 --- a/xlators/meta/src/Makefile.am +++ b/xlators/meta/src/Makefile.am @@ -4,7 +4,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/ meta_so_SOURCES = meta.c tree.c misc.c view.c noinst_HEADERS = meta.h tree.h misc.h view.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -shared +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src CLEANFILES = diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index ac257519bda..4ff1b59d35b 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -19,8 +19,8 @@ noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \ glusterd-pmap.h glusterd-volgen.h glusterd-mountbroker.h \ glusterd-syncop.h glusterd-hooks.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$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree \ -I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \ -I$(CONTRIBDIR)/uuid \ diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 96087fef41c..97a68b889a0 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -24,10 +24,10 @@ endif fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) -fuse_la_LDFLAGS = -module -avoidversion -shared +fuse_la_LDFLAGS = -module -avoidversion fuse_la_LIBADD = @GF_FUSE_LDADD@ -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/fuse-include \ -I$(CONTRIBDIR)/fuse-lib $(GF_CFLAGS) $(GF_FUSE_CFLAGS) diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am index ab7c103b654..4814c0ca2a0 100644 --- a/xlators/nfs/server/src/Makefile.am +++ b/xlators/nfs/server/src/Makefile.am @@ -10,9 +10,9 @@ server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = nfs.h nfs-common.h nfs-fops.h nfs-inodes.h nfs-generics.h \ mount3.h nfs3-fh.h nfs3.h nfs3-helpers.h nfs-mem-types.h nlm4.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" \ - -I$(top_srcdir)/libglusterfs/src -shared $(GF_CFLAGS)\ + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS)\ -I$(nfsrpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree\ -I$(top_srcdir)/rpc/xdr/src/ diff --git a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am index 8fe8c787bb6..0ad90f0e1c1 100644 --- a/xlators/performance/io-cache/src/Makefile.am +++ b/xlators/performance/io-cache/src/Makefile.am @@ -8,7 +8,7 @@ io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = io-cache.h ioc-mem-types.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/rbtree -shared $(GF_CFLAGS) +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/rbtree $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am index cab8c53652b..d250fe23008 100644 --- a/xlators/performance/io-threads/src/Makefile.am +++ b/xlators/performance/io-threads/src/Makefile.am @@ -8,7 +8,7 @@ io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = io-threads.h iot-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/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am index 31f88ac6d9f..3f7aabc713e 100644 --- a/xlators/performance/md-cache/src/Makefile.am +++ b/xlators/performance/md-cache/src/Makefile.am @@ -8,8 +8,8 @@ md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = md-cache-mem-types.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/rbtree -shared $(GF_CFLAGS) +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/rbtree $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am index afa5a37ae7c..89e2d38c61f 100644 --- a/xlators/performance/quick-read/src/Makefile.am +++ b/xlators/performance/quick-read/src/Makefile.am @@ -8,7 +8,7 @@ quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = quick-read.h quick-read-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/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am index 04e88899627..da06c3358ce 100644 --- a/xlators/performance/read-ahead/src/Makefile.am +++ b/xlators/performance/read-ahead/src/Makefile.am @@ -8,7 +8,7 @@ read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = read-ahead.h read-ahead-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/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am index 8c0a68d15e5..763d781825a 100644 --- a/xlators/performance/symlink-cache/src/Makefile.am +++ b/xlators/performance/symlink-cache/src/Makefile.am @@ -6,7 +6,7 @@ symlink_cache_la_LDFLAGS = -module -avoidversion symlink_cache_la_SOURCES = symlink-cache.c symlink_cache_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/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am index 26a1b725b50..9b9db3b4f1f 100644 --- a/xlators/performance/write-behind/src/Makefile.am +++ b/xlators/performance/write-behind/src/Makefile.am @@ -8,7 +8,7 @@ write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = write-behind-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/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am index 3d195b73973..d7d4e4b6468 100644 --- a/xlators/protocol/auth/addr/src/Makefile.am +++ b/xlators/protocol/auth/addr/src/Makefile.am @@ -6,7 +6,7 @@ addr_la_LDFLAGS = -module -avoidversion addr_la_SOURCES = addr.c addr_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) \ -I$(top_srcdir)/xlators/protocol/server/src \ -I$(top_srcdir)/rpc/rpc-lib/src/ diff --git a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am index 5c4b824cbee..e1a47c6d293 100644 --- a/xlators/protocol/auth/login/src/Makefile.am +++ b/xlators/protocol/auth/login/src/Makefile.am @@ -6,6 +6,6 @@ login_la_LDFLAGS = -module -avoidversion login_la_SOURCES = login.c login_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) \ -I$(top_srcdir)/xlators/protocol/server/src diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am index d3a38e7cff0..a02aa0737d8 100644 --- a/xlators/protocol/client/src/Makefile.am +++ b/xlators/protocol/client/src/Makefile.am @@ -13,6 +13,6 @@ client_la_SOURCES = client.c client-helpers.c client-rpc-fops.c \ noinst_HEADERS = client.h client-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) \ -I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src/ diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am index 0fa2f81d174..2e94dcb8788 100644 --- a/xlators/protocol/server/src/Makefile.am +++ b/xlators/protocol/server/src/Makefile.am @@ -12,8 +12,8 @@ server_la_SOURCES = server.c server-resolve.c server-helpers.c \ noinst_HEADERS = server.h server-helpers.h server-mem-types.h authenticate.h -AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src -shared \ +AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ + -I$(top_srcdir)/libglusterfs/src \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" \ $(GF_CFLAGS) -I$(top_srcdir)/xlators/protocol/lib/src \ diff --git a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am index e0d2a2f4871..85d72a1c8ab 100644 --- a/xlators/storage/posix/src/Makefile.am +++ b/xlators/storage/posix/src/Makefile.am @@ -9,8 +9,8 @@ posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO) noinst_HEADERS = posix.h posix-mem-types.h posix-handle.h posix-aio.h -AM_CFLAGS = -fPIC -fno-strict-aliasing $(GF_CPPFLAGS) \ - -Wall -I$(top_srcdir)/libglusterfs/src -shared \ +AM_CFLAGS = -fno-strict-aliasing $(GF_CPPFLAGS) \ + -Wall -I$(top_srcdir)/libglusterfs/src \ -I$(top_srcdir)/rpc/xdr/src \ -I$(top_srcdir)/rpc/rpc-lib/src $(GF_CFLAGS) diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am index fb2722ff873..6659b9d9c5a 100644 --- a/xlators/system/posix-acl/src/Makefile.am +++ b/xlators/system/posix-acl/src/Makefile.am @@ -6,8 +6,8 @@ posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = posix-acl.h posix-acl-xattr.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)\ -L$(xlatordir)/ CLEANFILES = |