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 /xlators/protocol | |
| 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>
Diffstat (limited to 'xlators/protocol')
| -rw-r--r-- | xlators/protocol/auth/addr/src/Makefile.am | 4 | ||||
| -rw-r--r-- | xlators/protocol/auth/login/src/Makefile.am | 4 | ||||
| -rw-r--r-- | xlators/protocol/client/src/Makefile.am | 4 | ||||
| -rw-r--r-- | xlators/protocol/server/src/Makefile.am | 4 |
4 files changed, 8 insertions, 8 deletions
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 \ |