[memcached] bradfitz, r375: automake foo from Robin H. Johnson: bui...

[commits at code.sixapart.com]

automake foo from Robin H. Johnson:  build two targets, and test on the debug one with asserts

U   trunk/server/Makefile.am
U   trunk/server/doc/CONTRIBUTORS.txt
U   trunk/server/t/lib/MemcachedTest.pm


Modified: trunk/server/Makefile.am
===================================================================
--- trunk/server/Makefile.am	2006-09-05 22:46:32 UTC (rev 374)
+++ trunk/server/Makefile.am	2006-09-06 02:44:13 UTC (rev 375)
@@ -1,20 +1,20 @@
-bin_PROGRAMS = memcached
+bin_PROGRAMS = memcached memcached-debug
 
-memcached_SOURCES = memcached.c slabs.c items.c memcached.h assoc.c
+memcached_SOURCES = memcached.c slabs.c items.c assoc.c
+memcached_debug_SOURCES = $(memcached_SOURCES)
+memcached_CPPFLAGS = -DNDEBUG
 memcached_LDADD = @LIBOBJS@
+memcached_debug_LDADD = $(memcached_LDADD)
 
 SUBDIRS = doc
 DIST_DIRS = scripts
 EXTRA_DIST = doc scripts TODO t
 
-test:	memcached
+memcached.c: memcached.h
+
+test:	memcached-debug
 	prove t
 
-# Uncomment the following to save some CPU (by disabling assertions), at the risk of silent data
-# structure corruption.  After all, this is a new branch of memcached, so you probably want
-# assertions enabled.
-#AM_CFLAGS=-DNDEBUG
-
 dist-hook:
 	rm -rf $(distdir)/doc/.svn/
 	rm -rf $(distdir)/scripts/.svn/

Modified: trunk/server/doc/CONTRIBUTORS.txt
===================================================================
--- trunk/server/doc/CONTRIBUTORS.txt	2006-09-05 22:46:32 UTC (rev 374)
+++ trunk/server/doc/CONTRIBUTORS.txt	2006-09-06 02:44:13 UTC (rev 375)
@@ -17,3 +17,8 @@
    Michael Johnson <ahze at ahze.net>
    Paul Querna <chip at corelands.com>
    Jamie McCarthy <jamie at mccarthy.vg>
+   Philip Neustrom <philipn at gmail.com>
+   Andrew O'Brien <andrewo at oriel.com.au>
+   Josh Rotenberg <joshrotenberg at gmail.com>
+   Robin H. Johnson <robbat2 at gentoo.org> -- automake foo
+

Modified: trunk/server/t/lib/MemcachedTest.pm
===================================================================
--- trunk/server/t/lib/MemcachedTest.pm	2006-09-05 22:46:32 UTC (rev 374)
+++ trunk/server/t/lib/MemcachedTest.pm	2006-09-06 02:44:13 UTC (rev 375)
@@ -79,7 +79,7 @@
     }
     my $childpid = fork();
 
-    my $exe = "$Bin/../memcached";
+    my $exe = "$Bin/../memcached-debug";
     croak("memcached binary doesn't exist.  Haven't run 'make' ?\n") unless -e $exe;
     croak("memcached binary not executable\n") unless -x _;