X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2FMakefile.am;h=e5a1f0c0afff8d7e5eb9eea1a84a2117a500fc7e;hb=e31617422d9af99123008f2b312d399d308491cc;hp=b9c4fba1292108cdca1fdaf012c776333a98496e;hpb=1b18496b3d1399d90cfba1975f23aee9c747445a;p=awesomized%2Flibmemcached

diff --git a/clients/Makefile.am b/clients/Makefile.am
index b9c4fba1..e5a1f0c0 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,11 +1,11 @@
 LDADDS = libutilities.la $(top_builddir)/libmemcached/libmemcached.la
 
-bin_PROGRAMS = memcat memdump memcp memstat memrm memflush memslap memerror
+bin_PROGRAMS = memcat memdump memcp memstat memrm memflush memslap memerror memcapable
 
 noinst_HEADERS = client_options.h \
 		utilities.h \
 		generator.h \
-		execute.h 
+		execute.h
 
 noinst_LTLIBRARIES= libutilities.la libgenexec.la
 
@@ -14,36 +14,33 @@ 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 = $(PTHREAD_LIBS) libgenexec.la $(LDADDS) 
-memslap_LDFLAGS = $(AM_LDFLAGS) -rpath $(pkglibdir)
+memslap_LDADD = $(PTHREAD_LIBS) libgenexec.la $(LDADDS)
+
+memcapable_SOURCES = memcapable.c
+if BUILD_BYTEORDER
+memcapable_LDADD=$(top_builddir)/libmemcached/libbyteorder.la
+endif
 
 test-start-server:
 	memflush --servers=localhost