From: hades Date: Fri, 8 Sep 2000 16:37:21 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0c111f4233dae9d505434b3d1b9e1bd14d12e76e;p=daqdata.git *** empty log message *** --- diff --git a/allParam/ca/Makefile b/allParam/ca/Makefile index e050047..eec54fd 100644 --- 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 43e2d2a..6494fc8 100644 --- 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 d18e07a..bac7c62 100644 --- 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 16a4768..6a84cbc 100644 --- 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 74853b5..c868867 100644 --- 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 52a0444..7f529cf 100644 --- 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