Changeset 38441 for trunk/Ohana/src/libohana/Makefile

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libohana/Makefile (modified) (5 diffs)

trunk/Ohana/src/libohana/Makefile

@@ -1 +1 @@
 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 +10 @@
 MAN     =       $(HOME)/doc
 INC     =       $(HOME)/include
-TESTDIR =       $(HOME)/test
+TESTDIR =       $(HOME)/test
+TESTBIN =       $(HOME)/test
 include ../../Makefile.Common
 
@@ -17 +18 @@
 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 +55 @@
 # $(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 +63 @@
 $(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