summaryrefslogtreecommitdiffstats
path: root/cli/src
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2012-10-03 09:49:40 -0400
committerAnand Avati <avati@redhat.com>2012-10-03 12:32:14 -0700
commit565cf6625da100f125cab21e590ab3e7ad0dce7e (patch)
tree873ea2e505813b86e9a57f6dd65b01262f4e3888 /cli/src
parent58e6296fa2b59506cacab32689df77a211e578cb (diff)
build: libraries must be in LDADD/LIBADD
Libraries must not be listed in LDFLAGS, because _order is important_. Details see http://stackoverflow.com/questions/4241683/linker-flags-in-wrong-place http://www.gentoo.org/proj/en/qa/asneeded.xml#doc_chap2_sect3 Change-Id: I0479456d6702748c555031bb20641ce430732ec7 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/4030 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'cli/src')
-rw-r--r--cli/src/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index 8b5a5054e93..393077688be 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -6,9 +6,10 @@ gluster_SOURCES = cli.c registry.c input.c cli-cmd.c cli-rl.c \
gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD)\
$(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \
- $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+ $(GF_GLUSTERFS_LIBS) $(LIBXML2_LIBS)
-gluster_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS) $(LIBXML2_LIBS)
+gluster_LDFLAGS = $(GF_LDFLAGS)
noinst_HEADERS = cli.h cli-mem-types.h cli-cmd.h
AM_CPPFLAGS = $(GF_CPPFLAGS) \