*** empty log message ***

diff --git a/allParam/ca/Makefile b/allParam/ca/Makefile
index e0500473b5ca657633cdf07c9ac929819b6f3638..eec54fda0b3bed10b5f469269c628150e2c1a77d 100644 (file)
--- a/allParam/ca/Makefile
+++ b/allParam/ca/Makefile
@@ -1,11 +1,18 @@
 EPICS_BASE = $(EPICS_HOME)/base
-CFLAGS = -g -I$(EPICS_BASE)/include -I$(EPICS_BASE)/include/os/$(HOST_ARCH)
+CFLAGS = -g -ansi -Wall -I$(EPICS_BASE)/include \
+  -I$(EPICS_BASE)/include/os/$(HOST_ARCH)
 
 libcaParam.a : param.o
        $(AR) $(ARFLAGS) $@ $<
 
 param.o : param.c param.h
 
+install : libcaParam.a
+       -mkdir -p $(LIBDIR)
+       install -m 644 $< $(LIBDIR)
+       -mkdir -p $(INCDIR)
+       install -m 644 param.h $(INCDIR)
+
 clean :
        rm -f *.o
 

diff --git a/allParam/file/Makefile b/allParam/file/Makefile
index 43e2d2ad4cf72a4cf88f1ebac6bc2c906835e14a..6494fc8ceeb33a77d5a56e30d625f7fff476d2b3 100644 (file)
--- a/allParam/file/Makefile
+++ b/allParam/file/Makefile
@@ -1,10 +1,16 @@
-CFLAGS = -g
+CFLAGS = -g -ansi -Wall
 
 libfileParam.a : param.o
        $(AR) $(ARFLAGS) $@ $<
 
 param.o : param.c param.h
 
+install : libfileParam.a
+       -mkdir -p $(LIBDIR)
+       install -m 644 $< $(LIBDIR)
+       -mkdir -p $(INCDIR)
+       install -m 644 param.h $(INCDIR)
+
 clean :
        rm -f *.o
 

diff --git a/allParam/ora/Makefile b/allParam/ora/Makefile
index d18e07aa963da79e6cee79fb170b0070dd51285b..bac7c62cbcce68b09f2984763cab3bea12bec5ca 100644 (file)
--- a/allParam/ora/Makefile
+++ b/allParam/ora/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -g -I$(ORACLE_HOME)/precomp/public/
+CFLAGS = -g -ansi -Wall -I$(ORACLE_HOME)/precomp/public/
 
 ORA_USER = daq/daqall@db-hades.gsi.de
 
@@ -22,6 +22,12 @@ param.o : param.c param.h
 param.c : param.pc
        $(PROC) $(PROCFLAGS) $(PROC_INCLUDES) iname=$< oname=$@
 
+install : liboraParam.a
+       -mkdir -p $(LIBDIR)
+       install -m 644 $< $(LIBDIR)
+       -mkdir -p $(INCDIR)
+       install -m 644 param.h $(INCDIR)
+
 clean :
        rm -f *.o param.c param.lis
 

diff --git a/allParam/psql/Makefile b/allParam/psql/Makefile
index 16a47680790cbd05f19dbcf5f647fcd18033bddc..6a84cbcf7733c10e0ff57ccf91b7e73378af03ed 100644 (file)
--- a/allParam/psql/Makefile
+++ b/allParam/psql/Makefile
@@ -1,10 +1,16 @@
-CFLAGS = -g -I/usr/include/pgsql
+CFLAGS = -g -ansi -Wall -I/usr/include/pgsql
 
 libpsqlParam.a : param.o
        $(AR) $(ARFLAGS) $@ $<
 
 param.o : param.c param.h
 
+install : libpsqlParam.a
+       -mkdir -p $(LIBDIR)
+       install -m 644 $< $(LIBDIR)
+       -mkdir -p $(INCDIR)
+       install -m 644 param.h $(INCDIR)
+
 clean :
        rm -f *.o
 

diff --git a/allParam/tcl/Makefile b/allParam/tcl/Makefile
index 74853b5d48428d79782e8e2b26a21be87d3ff327..c868867f04ead90b62f20aad8924ec91d28275db 100644 (file)
--- a/allParam/tcl/Makefile
+++ b/allParam/tcl/Makefile
@@ -1,10 +1,16 @@
-CFLAGS = -g
+CFLAGS = -g -ansi -Wall
 
 libtclParam.a : param.o
        $(AR) $(ARFLAGS) $@ $<
 
 param.o : param.c param.h
 
+install : libtclParam.a
+       -mkdir -p $(LIBDIR)
+       install -m 644 $< $(LIBDIR)
+       -mkdir -p $(INCDIR)
+       install -m 644 param.h $(INCDIR)
+
 clean :
        rm -f *.o
 

diff --git a/allParam/test/Makefile b/allParam/test/Makefile
index 52a0444d157bdce11503115c202ee8b25357080b..7f529cf98d349dea9ae4b290c909fd6e71de9598 100644 (file)
--- a/allParam/test/Makefile
+++ b/allParam/test/Makefile
@@ -2,29 +2,27 @@ MV = mv
 
 # Channel Access test
 HOST_ARCH = Linux
-#EPICS_HOME = $(HOME)/hades/epics
 EPICS_BASE = $(EPICS_HOME)/base
-CACFLAGS = -I$(HOME)/include/ca
-LOADCALIBES = -L$(HOME)/lib/$(SYSTYPE) -L$(EPICS_BASE)/lib/$(HOST_ARCH) \
-  -lcaParam -lca -lCom
+CACFLAGS = -g -ansi -Wall -I../ca
+LOADCALIBES = -L../ca -L$(EPICS_BASE)/lib/$(HOST_ARCH) -lcaParam -lca -lCom
 
 # File test
-FILECFLAGS = -I$(HOME)/include/file
-LOADFILELIBES = -L$(HOME)/lib/$(SYSTYPE) -lfileParam
+FILECFLAGS = -g -ansi -Wall -I../file
+LOADFILELIBES = -L../file -lfileParam
 
 # Oracle test
 ORACLE_HOME = /usr/local/oracle/product/8.0.5
-ORACFLAGS = -I$(HOME)/include/ora
-LOADORALIBES = -L$(HOME)/lib/$(SYSTYPE) -L$(ORACLE_HOME)/lib \
+ORACFLAGS = -g -ansi -Wall -I../ora
+LOADORALIBES = -L../ora -L$(ORACLE_HOME)/lib \
   -loraParam -lsql -lclntsh -lcommon -lcore4 -lnlsrtl3
 
 # PostgreSQL test
-PSQLCFLAGS = -I$(HOME)/include/psql
-LOADPSQLLIBES = -L$(HOME)/lib/$(SYSTYPE) -lpsqlParam -lpq -lcrypt
+PSQLCFLAGS = -g -ansi -Wall -I../psql
+LOADPSQLLIBES = -L../psql -lpsqlParam -lpq -lcrypt
 
 # Tcl test
-TCLCFLAGS = -I$(HOME)/include/tcl
-LOADTCLLIBES = -L$(HOME)/lib/$(SYSTYPE) -ltclParam -ltcl8.0 -lm -ldl
+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
@@ -35,30 +33,24 @@ LIBS = ca file ora psql tcl
 
 suite : $(addsuffix _suite,$(LIBS))
 
-test : $(addsuffix _suite_new,$(LIBS))
-       time ./ca_suite > test_protocol.txt 2>&1
-       time ./file_suite >> test_protocol.txt 2>&1
-       time ./ora_suite >> test_protocol.txt 2>&1
-       time ./psql_suite >> test_protocol.txt 2>&1
-       time ./tcl_suite >> test_protocol.txt 2>&1
+ca_test file_test ora_test psql_test tcl_test :
+       $(RM) $@_suite
+       $(MAKE) $@_suite
+       time ./$@_suite > $@_protocol.txt 2>&1
 
-$(addsuffix _suite_new,$(LIBS)) :
-       $(RM) $(patsubst %_new,%,$@)
-       $(MAKE) $(patsubst %_new,%,$@)
-
-ca_suite : $(addprefix ca_,$(OBJS))
+ca_test_suite : $(addprefix ca_,$(OBJS))
        $(CC) $(LDFLAGS) $(addprefix ca_,$(OBJS)) $(LOADCALIBES) -o $@
 
-file_suite : $(addprefix file_,$(OBJS))
+file_test_suite : $(addprefix file_,$(OBJS))
        $(CC) $(LDFLAGS) $(addprefix file_,$(OBJS)) $(LOADFILELIBES) -o $@
 
-ora_suite : $(addprefix ora_,$(OBJS))
+ora_test_suite : $(addprefix ora_,$(OBJS))
        $(CC) $(LDFLAGS) $(addprefix ora_,$(OBJS)) $(LOADORALIBES) -o $@
 
-psql_suite : $(addprefix psql_,$(OBJS))
+psql_test_suite : $(addprefix psql_,$(OBJS))
        $(CC) $(LDFLAGS) $(addprefix psql_,$(OBJS)) $(LOADPSQLLIBES) -o $@
 
-tcl_suite : $(addprefix tcl_,$(OBJS))
+tcl_test_suite : $(addprefix tcl_,$(OBJS))
        $(CC) $(LDFLAGS) $(addprefix tcl_,$(OBJS)) $(LOADTCLLIBES) -o $@
 
 $(addprefix ca_,$(OBJS)) :
@@ -82,13 +74,15 @@ $(addprefix tcl_,$(OBJS)) :
        $(MV) $(patsubst tcl_%,%,$@) $@
 
 suite.o : suite.c $(addsuffix .h, $(TESTS))
-       $(CC) -c $(CFLAGS) $(patsubst %.o,%.c,$@) -o $@
+       $(CC) -c $(CFLAGS) $(suite.c,$@) -o $@
 $(addsuffix .o, $(TESTS)) : $(patsubst %.o,%.c,$@) $(patsubst %.o,%.h,$@)
        $(CC) -c $(CFLAGS) $(patsubst %.o,%.c,$@) -o $@
 
 clean :
-       rm -f *.o test_protocol.txt sqlnet.log
+       rm -f *.o *test_protocol.txt sqlnet.log
 
 bin_clean :
-       rm *.o *_suite test_protocol.txt sqlnet.log
+       rm *.o *_suite *test_protocol.txt sqlnet.log
+
+ca_test file_test ora_test psql_test tcl_test : dummy