summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorTrond Norbye <Trond.Norbye@sun.com>2008-10-06 14:24:27 +0200
committerDustin Sallings <dustin@spy.net>2009-01-03 00:09:12 -0800
commit08c14e4e1e9c0f2cba1b45722d0f395887c150d7 (patch)
treea6042fd7f3628fbfbdcbdb1cf42e51cbeca79da0 /Makefile.am
parentafe5603f2b8cf7f85b8b3b0acc487b7251e308e0 (diff)
downloadmemcached-08c14e4e1e9c0f2cba1b45722d0f395887c150d7.tar.gz
Always use bundled daemonize function, fixed warnings on MacOSX
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 1faa0c0..a3b54b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,13 +3,13 @@ pkginclude_HEADERS = protocol_binary.h
BUILT_SOURCES= @DTRACE_HEADER@
-memcached_SOURCES = memcached.c slabs.c slabs.h items.c items.h assoc.c assoc.h memcached.h thread.c stats.c stats.h
+memcached_SOURCES = memcached.c slabs.c slabs.h items.c items.h assoc.c assoc.h memcached.h thread.c stats.c stats.h daemon.c
memcached_debug_SOURCES = $(memcached_SOURCES)
memcached_CPPFLAGS = -DNDEBUG
-memcached_LDADD = @DTRACE_OBJ@ @DAEMON_OBJ@
-memcached_debug_LDADD = @DTRACE_DEBUG_OBJ@ @DAEMON_OBJ@
-memcached_DEPENDENCIES = @DTRACE_OBJ@ @DAEMON_OBJ@
-memcached_debug_DEPENDENCIES = @DTRACE_DEBUG_OBJ@ @DAEMON_OBJ@
+memcached_LDADD = @DTRACE_OBJ@
+memcached_debug_LDADD = @DTRACE_DEBUG_OBJ@
+memcached_DEPENDENCIES = @DTRACE_OBJ@
+memcached_debug_DEPENDENCIES = @DTRACE_DEBUG_OBJ@
memcached_dtrace.h: memcached_dtrace.d
${DTRACE} -h -s memcached_dtrace.d
@@ -25,7 +25,7 @@ memcached_debug_dtrace.o: $(memcached_debug_OBJECTS)
SUBDIRS = doc
DIST_DIRS = scripts
-EXTRA_DIST = doc scripts TODO t memcached.spec daemon.c memcached_dtrace.d
+EXTRA_DIST = doc scripts TODO t memcached.spec memcached_dtrace.d
test: memcached-debug
prove $(srcdir)/t