projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
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 23debed104da4d2d53f18898be237ed421416099..7eba92863adf6d1dca8011bfd53198fb49f10258 100644
(file)
--- a/
clients/Makefile.am
+++ b/
clients/Makefile.am
@@
-1,40
+1,41
@@
-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 mem
dump mem
cp memstat memrm memflush memslap memerror
noinst_HEADERS = client_options.h \
utilities.h \
generator.h \
execute.h
noinst_HEADERS = client_options.h \
utilities.h \
generator.h \
execute.h
-memcat_SOURCES = memcat.c utilities.c
+noinst_LTLIBRARIES= libutilities.la libgenexec.la
+
+libutilities_la_SOURCES= utilities.c
+libgenexec_la_SOURCES= generator.c execute.c
+
+memcat_SOURCES = memcat.c
memcat_LDADD = $(LDADDS)
memcat_LDADD = $(LDADDS)
-memcat_LDFLAGS = -rpath $(pkglibdir)
-memcp_SOURCES = memcp.c
utilities.c
+memcp_SOURCES = memcp.c
memcp_LDADD = $(LDADDS)
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_LDADD = $(LDADDS)
-memstat_LDFLAGS = -rpath $(pkglibdir)
-memrm_SOURCES = memrm.c
utilities.c
+memrm_SOURCES = memrm.c
memrm_LDADD = $(LDADDS)
memrm_LDADD = $(LDADDS)
-memrm_LDFLAGS = -rpath $(pkglibdir)
-memflush_SOURCES = memflush.c
utilities.c
+memflush_SOURCES = memflush.c
memflush_LDADD = $(LDADDS)
memflush_LDADD = $(LDADDS)
-memflush_LDFLAGS = -rpath $(pkglibdir)
-memerror_SOURCES = memerror.c
utilities.c
+memerror_SOURCES = memerror.c
memerror_LDADD = $(LDADDS)
memerror_LDADD = $(LDADDS)
-memerror_LDFLAGS = -rpath $(pkglibdir)
-memslap_SOURCES = memslap.c
utilities.c generator.c execute.c
-memslap_
LDADD = $(LDADDS) -lpthread
-memslap_LD
FLAGS = -rpath $(pkglibdir)
+memslap_SOURCES = memslap.c
+memslap_
CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+memslap_LD
ADD = $(PTHREAD_LIBS) libgenexec.la $(LDADDS)
test-start-server:
memflush --servers=localhost
test-start-server:
memflush --servers=localhost