*** empty log message ***

diff --git a/allParam/test/Makefile b/allParam/test/Makefile
index f5f4fcf6b8998a16ae38d444bca8a3bdf6a918e9..5b83dc28c496b161829a6c93929aaa8140c1f114 100644 (file)
--- a/allParam/test/Makefile
+++ b/allParam/test/Makefile
@@ -13,16 +13,12 @@ LOADPSQLLIBES = -L../psql -lpsqlParam -lpq -lcrypt
 # Tcl test
 LOADTCLLIBES = -L../tcl -ltclParam -ltcl -lm -ldl
 
-#HEADERS = blob/*.h filename/*.h int/*.h string/*.h
-HEADERS = int/*.h string/*.h
+HEADERS = blob/*.h filename/*.h int/*.h string/*.h
 
 VPATH=.:blob:filename:int:string
 
 CFLAGS = -I../include
-#OBJS = suite.o blobobjs filenameobjs intobjs stringobjs
-#OBJS_V = suite.o blobobjs_v filenameobjs_v intobjs_v stringobjs_v
-OBJS = suite.o intobjs stringobjs
-OBJS_V = suite.o intobjs_v stringobjs_v
+OBJS = suite.o blobobjs filenameobjs intobjs stringobjs
 
 LIBS = ca file ora psql tcl
 
@@ -33,24 +29,11 @@ ca_test file_test ora_test psql_test tcl_test :
        $(TIME) ./$@_suite > $@_protocol.txt 2>&1
        bin/post_$@.sh
 
-ca_test_v file_test_v ora_test_v psql_test_v tcl_test_v :
-       $(RM) $@_suite
-       $(MAKE) $@_suite
-       bin/pre_$@.sh
-       $(TIME) ./$@_suite > $@_protocol.txt 2>&1
-       bin/post_$@.sh
-
-#ca_test_v_suite : $(OBJS_V)
-#      $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
-#        $(LOADCALIBES) -o $@
 ca_test_v_suite : $(OBJS_V)
-       $(CC) $(LDFLAGS) suite.o int/*.o string/*.o \
+       $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
          $(LOADCALIBES) -o $@
-#file_test_v_suite : $(OBJS_V)
-#      $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
-#        $(LOADFILELIBES) -o $@
 file_test_v_suite : $(OBJS_V)
-       $(CC) $(LDFLAGS) suite.o int/*.o string/*.o \
+       $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
          $(LOADFILELIBES) -o $@
 ora_test_v_suite : $(OBJS_V)
        $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
@@ -62,58 +45,19 @@ tcl_test_v_suite : $(OBJS_V)
        $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
          $(LOADTCLLIBES) -o $@
 
-#ca_test_suite : $(OBJS)
-#      $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
-#        $(LOADCALIBES) -o $@
-ca_test_suite : $(OBJS)
-       $(CC) $(LDFLAGS) suite.o int/*.o string/*.o \
-         $(LOADCALIBES) -o $@
-#file_test_suite : $(OBJS)
-#      $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
-#        $(LOADFILELIBES) -o $@
-file_test_suite : $(OBJS)
-       $(CC) $(LDFLAGS) suite.o int/*.o string/*.o \
-         $(LOADFILELIBES) -o $@
-ora_test_suite : $(OBJS)
-       $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
-         $(LOADORALIBES) -o $@
-psql_test_suite : $(OBJS)
-       $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
-         $(LOADPSQLLIBES) -o $@
-tcl_test_suite : $(OBJS)
-       $(CC) $(LDFLAGS) suite.o blob/*.o filename/*.o int/*.o string/*.o \
-         $(LOADTCLLIBES) -o $@
-
 suite.o : suite.c $(HEADERS)
 suite.c :
        bin/main.sh
 
 blobobjs :
-       cd blob ; $(MAKE) clean
        cd blob ; $(MAKE) "CFLAGS=-I../../include"
 filenameobjs :
-       cd filename ; $(MAKE) clean
        cd filename ; $(MAKE) "CFLAGS=-I../../include"
 intobjs :
-       cd int ; $(MAKE) clean
        cd int ; $(MAKE) "CFLAGS=-I../../include"
 stringobjs :
-       cd string ; $(MAKE) clean
        cd string ; $(MAKE) "CFLAGS=-I../../include"
 
-blobobjs_v :
-       cd blob ; $(MAKE) clean
-       cd blob ; $(MAKE) "CFLAGS=-DVERBOSE -I../../include"
-filenameobjs_v :
-       cd filename ; $(MAKE) clean
-       cd filename ; $(MAKE) "CFLAGS=-DVERBOSE -I../../include"
-intobjs_v :
-       cd int ; $(MAKE) clean
-       cd int ; $(MAKE) "CFLAGS=-DVERBOSE -I../../include"
-stringobjs_v :
-       cd string ; $(MAKE) clean
-       cd string ; $(MAKE) "CFLAGS=-DVERBOSE -I../../include"
-
 clean :
        cd blob ; $(MAKE) $@
        cd filename ; $(MAKE) $@