--- old/gdbmobj/Makefile.am	2007-07-16 22:39:35.000000000 +0000
+++ new/gdbmobj/Makefile.am	2007-07-16 22:40:26.000000000 +0000
@@ -6,25 +6,12 @@
 AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/../automake.fix @AUTOMAKE@
 
 LIBGDBMSOURCES=gdbmobj.h gdbmobj.c gdbmobj2.c gdbmobj3.c
-TESTGDBMSOURCES=testgdbm.C
-
-CLEANFILES=testgdbm.dat
 
 if FOUND_GDBM
 noinst_LTLIBRARIES=libgdbmobj.la
-noinst_PROGRAMS=testgdbm
 
 libgdbmobj_la_SOURCES=$(LIBGDBMSOURCES)
 
-testgdbm_SOURCES=$(TESTGDBMSOURCES)
-
-testgdbm_DEPENDENCIES=libgdbmobj.la
-testgdbm_LDADD=libgdbmobj.la @LIBGDBM@
-testgdbm_LDFLAGS=-static
-
-check-am:
-	$(srcdir)/testsuite | cmp -s - $(srcdir)/testsuite.txt
-
 else
 noinst_SCRIPTS=notfound
 
@@ -33,4 +20,4 @@
 
 endif
 
-EXTRA_DIST=$(LIBGDBMSOURCES) $(TESTGDBMSOURCES) testsuite testsuite.txt
+EXTRA_DIST=$(LIBGDBMSOURCES) testsuite testsuite.txt
--- old/bdbobj/Makefile.am	2007-07-16 22:41:14.000000000 +0000
+++ new/bdbobj/Makefile.am	2007-07-16 22:41:48.000000000 +0000
@@ -6,24 +6,12 @@
 AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/../automake.fix @AUTOMAKE@
 
 LIBDBOBJSOURCES=bdbobj.h bdbobj.c bdbobj2.c bdbobj3.c
-TESTBDBSOURCES=testbdb.C
-
-CLEANFILES=testbdb.dat
 
 if FOUND_DB
 noinst_LTLIBRARIES=libbdbobj.la
-noinst_PROGRAMS=testbdb
 
 libbdbobj_la_SOURCES=$(LIBDBOBJSOURCES)
 
-testbdb_SOURCES=$(TESTBDBSOURCES)
-
-testbdb_DEPENDENCIES=libbdbobj.la
-testbdb_LDADD=libbdbobj.la @LIBDB@
-testbdb_LDFLAGS=-static
-
-check-am:
-	$(srcdir)/testsuite | cmp -s - $(srcdir)/testsuite.txt
 else
 noinst_SCRIPTS=notfound
 
@@ -31,5 +19,4 @@
 	@exit 0
 endif
 
-EXTRA_DIST=$(LIBDBOBJSOURCES) $(TESTBDBSOURCES) testsuite testsuite.txt
-
+EXTRA_DIST=$(LIBDBOBJSOURCES) testsuite testsuite.txt