Index: trunk/Ohana/src/libohana/Makefile
===================================================================
--- trunk/Ohana/src/libohana/Makefile	(revision 37807)
+++ trunk/Ohana/src/libohana/Makefile	(revision 38441)
@@ -1,5 +1,5 @@
 default: install
 help:
-	@echo "make options: install libohana clean dist test typetest"
+	@echo "make options: install libohana clean dist test test.clean"
 
 include ../../Makefile.System
@@ -10,5 +10,6 @@
 MAN	=	$(HOME)/doc
 INC	=	$(HOME)/include
-TESTDIR =       $(HOME)/test
+TESTDIR	=	$(HOME)/test
+TESTBIN	=	$(HOME)/test
 include ../../Makefile.Common
 
@@ -17,7 +18,10 @@
 FULL_CPPFLAGS = $(BASE_CPPFLAGS)
 FULL_LDFLAGS  = $(BASE_LDFLAGS)
-TFLAGS        = $(FULL_CFLAGS) $(FULL_CPPFLAGS) $(FULL_LDFLAGS) -lohana -ltap_ohana
 
-install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.$(DLLTYPE) typetest
+TEST_CFLAGS   =	$(BASE_CFLAGS)
+TEST_CPPFLAGS =	$(BASE_CPPFLAGS)
+TEST_LDFLAGS  = $(BASE_LDFLAGS) -lohana -ltap_ohana
+
+install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.$(DLLTYPE)
 libohana: $(LIB)/libohana.$(ARCH).a $(LIB)/libohana.$(ARCH).$(DLLTYPE)
 
@@ -51,24 +55,4 @@
 # $(SRC)/gsl_utils.$(ARCH).o	 \
 
-TYPETEST = \
-$(TESTDIR)/typetest.$(ARCH)
-
-$(TYPETEST) : $(LIB)/libohana.$(ARCH).a
-
-typetest: $(TYPETEST)
-	for i in $(TYPETEST); do $$i || exit 1; done
-
-TEST = \
-$(TESTDIR)/memtest.$(ARCH)
-# $(TESTDIR)/string.$(ARCH)
-
-testcode: install $(TEST)
-test:
-	$(MAKE) testcode
-	for i in $(TEST); do $$i; done
-
-quicktest: 
-	for i in $(TEST); do $$i; done
-
 $(OBJS): $(INCS)
 
@@ -79,7 +63,8 @@
 $(DESTLIB)/libohana.$(DLLTYPE): $(LIB)/libohana.$(ARCH).$(DLLTYPE)
 
-$(TESTDIR)/%.$(ARCH) : $(TESTDIR)/%.c
-	$(CC) $^ -o $@ $(TFLAGS)
-
-.PHONY: test
-
+TESTPROG = memtest typetest string 
+$(TESTPROG) : % : $(TESTBIN)/% $(OBJS)
+test: $(TESTPROG)
+	for i in $(TESTPROG); do $(TESTBIN)/$$i 2>&1 | $(TESTHARNESS); done
+test.verbose: $(TESTPROG)
+	for i in $(TESTPROG); do $(TESTBIN)/$$i 2>&1 |& $(TESTHARNESS) -v; done