Removed hardcoded -rpath from client libs. libtool should be handling this appropriat...

[awesomized/libmemcached] / clients / Makefile.am

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 244c80d3b9e5a01b7759e581b5acce77841b2e1a..7eba92863adf6d1dca8011bfd53198fb49f10258 100644 (file)
--- 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
 
@@ -14,36 +14,28 @@ libgenexec_la_SOURCES= generator.c execute.c
 
 memcat_SOURCES = memcat.c
 memcat_LDADD = $(LDADDS)
-memcat_LDFLAGS = -rpath $(pkglibdir)
 
 memcp_SOURCES = memcp.c
 memcp_LDADD = $(LDADDS)
-memcp_LDFLAGS = -rpath $(pkglibdir)
 
 memdump_SOURCES = memdump.c
 memdump_LDADD = $(LDADDS)
-memdump_LDFLAGS = -rpath $(pkglibdir)
 
 memstat_SOURCES = memstat.c
 memstat_LDADD = $(LDADDS)
-memstat_LDFLAGS = -rpath $(pkglibdir)
 
 memrm_SOURCES = memrm.c
 memrm_LDADD = $(LDADDS)
-memrm_LDFLAGS = -rpath $(pkglibdir)
 
 memflush_SOURCES = memflush.c
 memflush_LDADD = $(LDADDS)
-memflush_LDFLAGS = -rpath $(pkglibdir)
 
 memerror_SOURCES = memerror.c
 memerror_LDADD = $(LDADDS)
-memerror_LDFLAGS = -rpath $(pkglibdir)
 
 memslap_SOURCES = memslap.c
 memslap_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-memslap_LDADD = $(LDADDS) $(PTHREAD_LIBS) libgenexec.la
-memslap_LDFLAGS = $(AM_LDFLAGS) -rpath $(pkglibdir)
+memslap_LDADD = $(PTHREAD_LIBS) libgenexec.la $(LDADDS) 
 
 test-start-server:
        memflush --servers=localhost