*** empty log message ***

diff --git a/allParam/test/Makefile b/allParam/test/Makefile
index d3f1c12c4c21b29bd23e75d1bbb917a8b138aba4..3ffa77b2ffd6a642cb6523e24245a169439ea723 100644 (file)
--- a/allParam/test/Makefile
+++ b/allParam/test/Makefile
@@ -1,4 +1,4 @@
-MV = mv
+MV = ./mv.sh
 
 # Channel Access test
 HOST_ARCH = Linux
@@ -24,11 +24,43 @@ LOADPSQLLIBES = -L../psql -lpsqlParam -lpq -lcrypt
 TCLCFLAGS = -g -ansi -Wall -I../tcl
 LOADTCLLIBES = -L../tcl -ltclParam -ltcl8.0 -lm -ldl
 
-TESTS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 \
-  test12 test13 test14 test15 test16 test17 test18 test19 test20 test21 test22
-
-OBJS = suite.o $(addsuffix .o,$(TESTS))
-
+HEADERS = test1.h test2.h test3.h test4.h test5.h test6.h test7.h test8.h \
+  test9.h test10.h test11.h test12.h test13.h test14.h test15.h test16.h \
+  test17.h test18.h test19.h test20.h test21.h test22.h
+
+OBJS = suite.o test1.o test2.o test3.o test4.o test5.o test6.o test7.o \
+  test8.o test9.o test10.o test11.o test12.o test13.o test14.o test15.o \
+  test16.o test17.o test18.o test19.o test20.o test21.o test22.o 
+
+CAOBJS = ca_suite.o ca_test1.o ca_test2.o ca_test3.o ca_test4.o ca_test5.o \
+  ca_test6.o ca_test7.o ca_test8.o ca_test9.o ca_test10.o ca_test11.o \
+  ca_test12.o ca_test13.o ca_test14.o ca_test15.o ca_test16.o ca_test17.o \
+  ca_test18.o ca_test19.o ca_test20.o ca_test21.o ca_test22.o
+
+FILEOBJS = file_suite.o file_test1.o file_test2.o file_test3.o file_test4.o \
+  file_test5.o file_test6.o file_test7.o file_test8.o file_test9.o \
+  file_test10.o file_test11.o file_test12.o file_test13.o file_test14.o \
+  file_test15.o file_test16.o file_test17.o file_test18.o file_test19.o \
+  file_test20.o file_test21.o file_test22.o
+
+ORAOBJS = ora_suite.o ora_test1.o ora_test2.o ora_test3.o ora_test4.o \
+  ora_test5.o ora_test6.o ora_test7.o ora_test8.o ora_test9.o ora_test10.o \
+  ora_test11.o ora_test12.o ora_test13.o ora_test14.o ora_test15.o \
+  ora_test16.o ora_test17.o ora_test18.o ora_test19.o ora_test20.o \
+  ora_test21.o ora_test22.o
+
+PSQLOBJS = psql_suite.o psql_test1.o psql_test2.o psql_test3.o psql_test4.o \
+  psql_test5.o psql_test6.o psql_test7.o psql_test8.o psql_test9.o \
+  psql_test10.o psql_test11.o psql_test12.o psql_test13.o psql_test14.o \
+  psql_test15.o psql_test16.o psql_test17.o psql_test18.o psql_test19.o \
+  psql_test20.o psql_test21.o psql_test22.o
+
+TCLOBJS = tcl_suite.o tcl_test1.o tcl_test2.o tcl_test3.o tcl_test4.o \
+  tcl_test5.o tcl_test6.o tcl_test7.o tcl_test8.o tcl_test9.o tcl_test10.o \
+  tcl_test11.o tcl_test12.o tcl_test13.o tcl_test14.o tcl_test15.o \
+  tcl_test16.o tcl_test17.o tcl_test18.o tcl_test19.o tcl_test20.o \
+  tcl_test21.o tcl_test22.o
+  
 LIBS = ca file ora psql tcl
 
 ca_test file_test ora_test psql_test tcl_test :
@@ -36,45 +68,28 @@ ca_test file_test ora_test psql_test tcl_test :
        $(MAKE) $@_suite
        time ./$@_suite > $@_protocol.txt 2>&1
 
-ca_test_suite : $(addprefix ca_,$(OBJS))
-       $(CC) $(LDFLAGS) $(addprefix ca_,$(OBJS)) $(LOADCALIBES) -o $@
-
-file_test_suite : $(addprefix file_,$(OBJS))
-       $(CC) $(LDFLAGS) $(addprefix file_,$(OBJS)) $(LOADFILELIBES) -o $@
-
-ora_test_suite : $(addprefix ora_,$(OBJS))
-       $(CC) $(LDFLAGS) $(addprefix ora_,$(OBJS)) $(LOADORALIBES) -o $@
-
-psql_test_suite : $(addprefix psql_,$(OBJS))
-       $(CC) $(LDFLAGS) $(addprefix psql_,$(OBJS)) $(LOADPSQLLIBES) -o $@
-
-tcl_test_suite : $(addprefix tcl_,$(OBJS))
-       $(CC) $(LDFLAGS) $(addprefix tcl_,$(OBJS)) $(LOADTCLLIBES) -o $@
-
-$(addprefix ca_,$(OBJS)) :
-       $(MAKE) $(patsubst ca_%,%,$@) "CFLAGS=$(CACFLAGS)"
-       $(MV) $(patsubst ca_%,%,$@) $@
-
-$(addprefix file_,$(OBJS)) :
-       $(MAKE) $(patsubst file_%,%,$@) "CFLAGS=$(FILECFLAGS)"
-       $(MV) $(patsubst file_%,%,$@) $@
-
-$(addprefix ora_,$(OBJS)) :
-       $(MAKE) $(patsubst ora_%,%,$@) "CFLAGS=$(ORACFLAGS)"
-       $(MV) $(patsubst ora_%,%,$@) $@
-
-$(addprefix psql_,$(OBJS)) :
-       $(MAKE) $(patsubst psql_%,%,$@) "CFLAGS=$(PSQLCFLAGS)"
-       $(MV) $(patsubst psql_%,%,$@) $@
-
-$(addprefix tcl_,$(OBJS)) :
-       $(MAKE) $(patsubst tcl_%,%,$@) "CFLAGS=$(TCLCFLAGS)"
-       $(MV) $(patsubst tcl_%,%,$@) $@
-
-suite.o : suite.c $(addsuffix .h, $(TESTS))
-       $(CC) -c $(CFLAGS) suite.c -o $@
-$(addsuffix .o, $(TESTS)) : $(patsubst %.o,%.c,$@) $(patsubst %.o,%.h,$@)
-       $(CC) -c $(CFLAGS) $(patsubst %.o,%.c,$@) -o $@
+ca_test_suite :
+       $(MAKE) $(OBJS) "CFLAGS=$(CACFLAGS)"
+       $(MV) ca_ $(OBJS)
+       $(CC) $(LDFLAGS) $(CAOBJS) $(LOADCALIBES) -o $@
+file_test_suite :
+       $(MAKE) $(OBJS) "CFLAGS=$(FILECFLAGS)"
+       $(MV) file_ $(OBJS)
+       $(CC) $(LDFLAGS) $(FILEOBJS) $(LOADFILELIBES) -o $@
+ora_test_suite :
+       $(MAKE) $(OBJS) "CFLAGS=$(ORACFLAGS)"
+       $(MV) ora_ $(OBJS)
+       $(CC) $(LDFLAGS) $(ORAOBJS) $(LOADORALIBES) -o $@
+psql_test_suite :
+       $(MAKE) $(OBJS) "CFLAGS=$(PSQLCFLAGS)"
+       $(MV) psql_ $(OBJS)
+       $(CC) $(LDFLAGS) $(PSQLOBJS) $(LOADPSQLLIBES) -o $@
+tcl_test_suite :
+       $(MAKE) $(OBJS) "CFLAGS=$(TCLCFLAGS)"
+       $(MV) tcl_ $(OBJS)
+       $(CC) $(LDFLAGS) $(TCLOBJS) $(LOADTCLLIBES) -o $@
+
+suite.o : suite.c $(HEADERS)
 
 clean :
        rm -f *.o *test_protocol.txt sqlnet.log
@@ -83,5 +98,6 @@ bin_clean :
        rm *.o *_suite *test_protocol.txt sqlnet.log
 
 ca_test file_test ora_test psql_test tcl_test : dummy
+
 dummy :