diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2012-10-03 09:45:22 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-10-03 12:25:34 -0700 |
| commit | b026c96a61a65393ab0469aa1d9187b1c258e3a7 (patch) | |
| tree | dc684cc265d9546e424dbc6f79c85839e3169a52 | |
| parent | 1ecbb7ca68bd39ede792414b21a772469ecb4094 (diff) | |
build: move -L arguments out of CFLAGS
"-L" is a linker flag, and as such should be in LDFLAGS, not CFLAGS, to
have guaranteed effect.
Change-Id: I014db3f48823d4923b45e0695b62b124eb1a1506
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/4028
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/Makefile.am | 3 | ||||
| -rw-r--r-- | xlators/nfs/server/src/Makefile.am | 4 | ||||
| -rw-r--r-- | xlators/system/posix-acl/src/Makefile.am | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index 4ff1b59d3..f00d7a422 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -21,13 +21,14 @@ noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \ AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS)\ - -I$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree \ + -I$(rpclibdir) -I$(CONTRIBDIR)/rbtree \ -I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \ -I$(CONTRIBDIR)/uuid \ -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(LIBXML2_CFLAGS) +AM_LDFLAGS = -L$(xlatordir) CLEANFILES = diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am index 4814c0ca2..98fcc5846 100644 --- a/xlators/nfs/server/src/Makefile.am +++ b/xlators/nfs/server/src/Makefile.am @@ -13,7 +13,9 @@ noinst_HEADERS = nfs.h nfs-common.h nfs-fops.h nfs-inodes.h nfs-generics.h \ AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" \ -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS)\ - -I$(nfsrpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree\ + -I$(nfsrpclibdir) -I$(CONTRIBDIR)/rbtree\ -I$(top_srcdir)/rpc/xdr/src/ +AM_LDFLAGS = -L$(xlatordir) + CLEANFILES = diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am index 6659b9d9c..200717f26 100644 --- a/xlators/system/posix-acl/src/Makefile.am +++ b/xlators/system/posix-acl/src/Makefile.am @@ -7,8 +7,9 @@ posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = posix-acl.h posix-acl-xattr.h AM_CFLAGS = $(GF_CPPFLAGS) -Wall \ - -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS)\ - -L$(xlatordir)/ + -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) + +AM_LDFLAGS = -L$(xlatordir) CLEANFILES = |