Merge

[awesomized/libmemcached] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 38146fb383272b865eb9344e8feedd125a90a150..004f2e1ae35f7ab660994d67e159c317e7f58e1e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,38 @@
-INCLUDES = -I$(top_builddir)/include\r
-LDADDS = ../lib/libmemcached.la\r
-\r
-bin_PROGRAMS = memcat memcp memrm\r
-\r
-memcat_SOURCES = memcat.c\r
-memcat_LDADD = $(LDADDS)\r
-\r
-memcp_SOURCES = memcp.c\r
-memcp_LDADD = $(LDADDS)\r
-\r
-memrm_SOURCES = memrm.c\r
-memrm_LDADD = $(LDADDS)\r
+INCLUDES = -I$(top_builddir)/include
+LDADDS = $(top_builddir)/lib/libmemcached.la
+
+bin_PROGRAMS = memcat memcp memstat memrm memflush memslap memerror
+
+noinst_HEADERS = client_options.h \
+               utilities.h \
+               generator.h \
+               execute.h 
+
+memcat_SOURCES = memcat.c utilities.c
+memcat_LDADD = $(LDADDS)
+memcat_LDFLAGS = -rpath $(pkglibdir)
+
+memcp_SOURCES = memcp.c utilities.c
+memcp_LDADD = $(LDADDS)
+memcp_LDFLAGS = -rpath $(pkglibdir)
+
+memstat_SOURCES = memstat.c utilities.c
+memstat_LDADD = $(LDADDS)
+memstat_LDFLAGS = -rpath $(pkglibdir)
+
+memrm_SOURCES = memrm.c utilities.c
+memrm_LDADD = $(LDADDS)
+memrm_LDFLAGS = -rpath $(pkglibdir)
+
+memflush_SOURCES = memflush.c utilities.c
+memflush_LDADD = $(LDADDS)
+memflush_LDFLAGS = -rpath $(pkglibdir)
+
+
+memerror_SOURCES = memerror.c utilities.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)