new setting of environment

diff --git a/hadaq/Makefile b/hadaq/Makefile
index a8d3781851885c75fb545e1b05514b9c717f66b9..356871d5f497b41a2157346510679d289a799a76 100644 (file)
--- a/hadaq/Makefile
+++ b/hadaq/Makefile
@@ -1,5 +1,10 @@
 CFLAGS = -g $(INCLUDES) $(DEFINES)
 
+#HW_OBJS = hwtof.o hwv775.o hwv878.o hwv488.o hwdtu.o hwsis3801.o
+#HW_OBJS = hwrich.o hwrace.o rc.o
+HW_OBJS = hwsoft.o
+
+
 DAQ_XMANAGE_OBJS = tcldaq.o tkAppInit.o \
        agent_clnt.o agent_xdr.o worker.o psxshm.o mman.o
 DAQ_MANAGE_OBJS = tcldaq.o tclAppInit.o \
@@ -77,12 +82,12 @@ daq_anal: $(DAQ_ANAL_OBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) $(DAQ_ANAL_OBJS) $(LOADLIBES) -o daq_anal
 
 clean:
-       rm -f *.o *.out core tags \
+       rm -f makefile *.o *.out core tags \
        agent.h agent_clnt.c agent_svc.c agent_xdr.c \
        online.h online_clnt.c online_svc.c online_xdr.c
 
 latm.o: latm.c latm.h
-       $(CC) $(CFLAGS) -c latm.c
+       cc $(CFLAGS) -c latm.c
 
 online_clnt.c: online.x
        $(RPCGEN) -l online.x >online_clnt.c

diff --git a/hadaq/makeenv b/hadaq/makeenv
index 547f6d52ef0645a38cdd5f99d3dfc9afca39bd48..9f7e5cbe9e11e4de628dc05782a38e4437175a22 100644 (file)
--- a/hadaq/makeenv
+++ b/hadaq/makeenv
@@ -1,47 +1,53 @@
-if test HADAQ_CONF = "UNIX"
-then
-CC = c89
-RPCGEN = rpcgen
-LOADLIBES = -L/usr/local/lib/ -lhadesstd -L/usr/fore/lib -latm -lrt -ltk -lX11 -ltcl -lm
-INCLUDES = -I/usr/local/include -I/usr/fore/include
-DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT
-elif test HADAQ_CONF = "UNIX_WO_ATM"
-then
-CC = c89
-RPCGEN = rpcgen
-LOADLIBES = -L/usr/local/lib/ -lhadesstd -llvme -lrt -ltk -lX11 -ltcl -lm
-INCLUDES = -I/usr/local/include -I/usr/fore/include
-DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM
-elif test HADAQ_CONF = "LINUX"
-then
-CC = gcc
-RPCGEN = rpcgen -k
-LOADLIBES = -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -llvme
-INCLUDES = -I$(HOME)/include
-DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM
-elif test HADAQ_CONF = "LYNXOS"
-then
-CC = gcc
-RPCGEN = rpcgen
-LOADLIBES = -L/usr/local/lib -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet -L/usr/ATM/lib -latm -L/lib/ces -lvme -lbma -luio
-INCLUDES = -I/usr/local/include -I$(HOME)/include -I/usr/ATM/include
-DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT
-elif test HADAQ_CONF = "LYNXOS_E7"
-then
-CC = gcc
-RPCGEN = rpcgen
-LOADLIBES = -L/usr/local/lib -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet ../*.o
-INCLUDES = -I/usr/local/include -I$(HOME)/include
-DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DNOATM
+HADAQ_CONF=$1
+HW_CONF=$2
+
+if test $HADAQ_CONF = "UNIX"
+then
+export CC="c89"
+export RPCGEN="rpcgen"
+export LOADLIBES="-L/usr/local/lib/ -lhadesstd -L/usr/fore/lib -latm -lrt -ltk -lX11 -ltcl -lm"
+export INCLUDES="-I/usr/local/include -I/usr/fore/include"
+export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT"
+elif test $HADAQ_CONF = "UNIX_WO_ATM"
+then
+export CC="c89"
+export RPCGEN="rpcgen"
+export LOADLIBES="-L/usr/local/lib/ -lhadesstd -llvme -lrt -ltk -lX11 -ltcl -lm"
+export INCLUDES="-I/usr/local/include -I/usr/fore/include"
+export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM"
+elif test $HADAQ_CONF = "LINUX"
+then
+export CC="gcc"
+export RPCGEN="rpcgen -k"
+export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llvme"
+export INCLUDES="-I$HOME/include"
+export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM"
+elif test $HADAQ_CONF = "LYNXOS"
+then
+export CC="gcc"
+export RPCGEN="rpcgen"
+export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet -L/usr/ATM/lib -latm -L/lib/ces -lvme -lbma -luio"
+export INCLUDES="-I/usr/local/include -I$HOME/include -I/usr/ATM/include"
+export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT"
+elif test $HADAQ_CONF = "LYNXOS_E7"
+then
+export CC="gcc"
+export RPCGEN="rpcgen"
+export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet ../*.o"
+export INCLUDES="-I/usr/local/include -I$HOME/include"
+export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DNOATM"
 fi
 
-if test HW_CONF = "SOFT"
+if test $HW_CONF = "SOFT"
+then
+export HW_OBJS="hwsoft.o"
+elif test $HW_CONF = "SEB"
 then
-HW_OBJS = hwsoft.o
-elif test HW_CONF = "SEB"
+export HW_OBJS="hwtof.o hwv775.o hwv878.o hwv488.o hwdtu.o hwsis3801.o"
+elif test $HW_CONF = "RICH"
 then
-HW_OBJS = hwtof.o hwv775.o hwv878.o hwv488.o hwdtu.o hwsis3801.o
-elif test HW_CONF = "RICH"
+export HW_OBJS="hwrich.o hwrace.o rc.o"
+elif test $HW_CONF = "TBUS"
 then
-HW_OBJS = hwrich.o hwrace.o rc.o
+export HW_OBJS="hwtbus.o hwdtu.o"
 fi