X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2FMakefile.am;h=e3939eb20edfb974493ad0ce0c8b37721fe0ec24;hb=824533fd2626b1060855e543aaad381675ae2695;hp=23debed104da4d2d53f18898be237ed421416099;hpb=1d7f999b7d38db3308a0533a83fea23987fb0178;p=m6w6%2Flibmemcached

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 23debed1..e3939eb2 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,40 +1,65 @@
-INCLUDES = -I$(top_builddir)
-LDADDS = $(top_builddir)/libmemcached/libmemcached.la
+LDADDS = libutilities.la $(top_builddir)/libmemcached/libmemcached.la
 
-bin_PROGRAMS = memcat memcp memstat memrm memflush memslap memerror
+bin_PROGRAMS = memcat memdump memcp memstat memrm memflush memerror memcapable
 
-noinst_HEADERS = client_options.h \
-		utilities.h \
+if HAVE_LIBEVENT
+  bin_PROGRAMS += memslap
+endif
+
+noinst_HEADERS = \
+		client_options.h \
+		execute.h \
 		generator.h \
-		execute.h 
+		ms_atomic.h \
+		ms_conn.h \
+		ms_memslap.h \
+		ms_setting.h \
+		ms_sigsegv.h \
+		ms_stats.h \
+		ms_task.h \
+		ms_thread.h \
+		utilities.h
+
+noinst_LTLIBRARIES= libutilities.la libgenexec.la
+
+libutilities_la_SOURCES= utilities.c
+libgenexec_la_SOURCES= generator.c execute.c
 
-memcat_SOURCES = memcat.c utilities.c
+memcat_SOURCES = memcat.c
 memcat_LDADD = $(LDADDS)
-memcat_LDFLAGS = -rpath $(pkglibdir)
 
-memcp_SOURCES = memcp.c utilities.c
+memcp_SOURCES = memcp.c
 memcp_LDADD = $(LDADDS)
-memcp_LDFLAGS = -rpath $(pkglibdir)
 
-memstat_SOURCES = memstat.c utilities.c
+memdump_SOURCES = memdump.c
+memdump_LDADD = $(LDADDS)
+
+memstat_SOURCES = memstat.c
 memstat_LDADD = $(LDADDS)
-memstat_LDFLAGS = -rpath $(pkglibdir)
 
-memrm_SOURCES = memrm.c utilities.c
+memrm_SOURCES = memrm.c
 memrm_LDADD = $(LDADDS)
-memrm_LDFLAGS = -rpath $(pkglibdir)
 
-memflush_SOURCES = memflush.c utilities.c
+memflush_SOURCES = memflush.c
 memflush_LDADD = $(LDADDS)
-memflush_LDFLAGS = -rpath $(pkglibdir)
 
-memerror_SOURCES = memerror.c utilities.c
+memerror_SOURCES = memerror.c
 memerror_LDADD = $(LDADDS)
-memerror_LDFLAGS = -rpath $(pkglibdir)
 
-memslap_SOURCES = memslap.c utilities.c generator.c execute.c
-memslap_LDADD = $(LDADDS) -lpthread
-memslap_LDFLAGS = -rpath $(pkglibdir)
+memslap_SOURCES = \
+		memslap.c \
+		ms_conn.c \
+		ms_setting.c \
+		ms_sigsegv.c \
+		ms_stats.c \
+		ms_task.c \
+		ms_thread.c
+memslap_LDADD = $(LTLIBEVENT) libgenexec.la $(LDADDS)
+
+memcapable_SOURCES = memcapable.c
+if BUILD_BYTEORDER
+memcapable_LDADD=$(top_builddir)/libmemcached/libbyteorder.la
+endif
 
 test-start-server:
 	memflush --servers=localhost