libmemcached

Merge lp://staging/~trond-norbye/libmemcached/bug_423114 into lp://staging/~tangent-org/libmemcached/trunk

  1. bug_423114
  2. Merge into trunk
Proposed by Trond Norbye
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~trond-norbye/libmemcached/bug_423114
Merge into: lp://staging/~tangent-org/libmemcached/trunk
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~trond-norbye/libmemcached/bug_423114
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+11049@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Trond Norbye (trond-norbye) wrote :

Fix the link order of the libraries

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clients/Makefile.am'
2--- clients/Makefile.am 2009-07-08 17:58:46 +0000
3+++ clients/Makefile.am 2009-09-02 11:14:46 +0000
4@@ -1,4 +1,4 @@
5-LDADDS = $(top_builddir)/libmemcached/libmemcached.la libutilities.la
6+LDADDS = libutilities.la $(top_builddir)/libmemcached/libmemcached.la
7
8 bin_PROGRAMS = memcat memdump memcp memstat memrm memflush memslap memerror
9
10@@ -42,7 +42,7 @@
11
12 memslap_SOURCES = memslap.c
13 memslap_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
14-memslap_LDADD = $(LDADDS) $(PTHREAD_LIBS) libgenexec.la
15+memslap_LDADD = $(PTHREAD_LIBS) libgenexec.la $(LDADDS)
16 memslap_LDFLAGS = $(AM_LDFLAGS) -rpath $(pkglibdir)
17
18 test-start-server:
19
20=== modified file 'tests/Makefile.am'
21--- tests/Makefile.am 2009-07-16 00:17:40 +0000
22+++ tests/Makefile.am 2009-09-02 11:14:46 +0000
23@@ -27,19 +27,19 @@
24
25 testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
26 testapp_SOURCES = function.c
27-testapp_LDADD = $(LDADDS) $(top_builddir)/clients/libgenexec.la libtest.la libserver.la
28+testapp_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS)
29
30 testplus_SOURCES = plus.cpp
31-testplus_LDADD = $(LDADDS) libtest.la libserver.la
32+testplus_LDADD = libtest.la libserver.la $(LDADDS)
33
34 udptest_SOURCES = udp.c
35-udptest_LDADD = $(LDADDS) libtest.la libserver.la
36+udptest_LDADD = libtest.la libserver.la $(LDADDS)
37
38 atomsmasher_SOURCES = atomsmasher.c
39-atomsmasher_LDADD = $(LDADDS) $(top_builddir)/clients/libgenexec.la libtest.la libserver.la
40+atomsmasher_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS)
41
42 startservers_SOURCES = start.c
43-startservers_LDADD = $(LDADDS) libserver.la
44+startservers_LDADD = libserver.la $(LDADDS)
45
46 record:
47 ./testapp > output.res

Subscribers

People subscribed via source and target branches

to all changes: