From c70403b0e313d4985e1bddc5584a4c1bd7e7f780 Mon Sep 17 00:00:00 2001 From: Trond Norbye Date: Wed, 2 Sep 2009 13:14:46 +0200 Subject: [PATCH] Bug #423114 Programs list the libraries in the wrong order --- clients/Makefile.am | 4 ++-- tests/Makefile.am | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/clients/Makefile.am b/clients/Makefile.am index 244c80d3..b9c4fba1 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -1,4 +1,4 @@ -LDADDS = $(top_builddir)/libmemcached/libmemcached.la libutilities.la +LDADDS = libutilities.la $(top_builddir)/libmemcached/libmemcached.la bin_PROGRAMS = memcat memdump memcp memstat memrm memflush memslap memerror @@ -42,7 +42,7 @@ memerror_LDFLAGS = -rpath $(pkglibdir) memslap_SOURCES = memslap.c memslap_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -memslap_LDADD = $(LDADDS) $(PTHREAD_LIBS) libgenexec.la +memslap_LDADD = $(PTHREAD_LIBS) libgenexec.la $(LDADDS) memslap_LDFLAGS = $(AM_LDFLAGS) -rpath $(pkglibdir) test-start-server: diff --git a/tests/Makefile.am b/tests/Makefile.am index 5cc1f82e..c840f68c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,19 +27,19 @@ libtest_la_SOURCES= test.c testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) testapp_SOURCES = function.c -testapp_LDADD = $(LDADDS) $(top_builddir)/clients/libgenexec.la libtest.la libserver.la +testapp_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS) testplus_SOURCES = plus.cpp -testplus_LDADD = $(LDADDS) libtest.la libserver.la +testplus_LDADD = libtest.la libserver.la $(LDADDS) udptest_SOURCES = udp.c -udptest_LDADD = $(LDADDS) libtest.la libserver.la +udptest_LDADD = libtest.la libserver.la $(LDADDS) atomsmasher_SOURCES = atomsmasher.c -atomsmasher_LDADD = $(LDADDS) $(top_builddir)/clients/libgenexec.la libtest.la libserver.la +atomsmasher_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS) startservers_SOURCES = start.c -startservers_LDADD = $(LDADDS) libserver.la +startservers_LDADD = libserver.la $(LDADDS) record: ./testapp > output.res -- 2.30.2