From d72a41ca4be46612a84ce6c1dd56fd1bebcc5490 Mon Sep 17 00:00:00 2001 From: hades Date: Sat, 11 Nov 2000 13:19:41 +0000 Subject: [PATCH] *** empty log message *** --- hadaq/hwrich.c | 4 ++-- hadaq/makeenv | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c index 9167f6e..f1deaa0 100644 --- a/hadaq/hwrich.c +++ b/hadaq/hwrich.c @@ -1,4 +1,4 @@ -static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.10 2000-11-08 07:53:23 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.11 2000-11-11 13:19:41 hades Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -21,7 +21,7 @@ static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/had #include "hwrace.h" /* Set number of RCs here */ -#define NRACES 4 +#define NRACES 2 struct HardwareS { size_t maxSubEvtSize; diff --git a/hadaq/makeenv b/hadaq/makeenv index 8000921..d481e59 100644 --- a/hadaq/makeenv +++ b/hadaq/makeenv @@ -12,15 +12,15 @@ elif test $HADAQ_CONF = "HPUX" then export CC="cc -Ae" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib/ -L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltk -lX11 -ltcl -lm" - export INCLUDES="-I/usr/local/include -I$HOME/include" + export LOADLIBES="-L/usr/local/lib/ -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme -ltk -lX11 -ltcl -lm" + export INCLUDES="-I/usr/local/include -I$HOME/include -I$HOME/include/tcl" export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT" elif test $HADAQ_CONF = "UNIX_NOATM" then export CC="c89" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib/ -L$HOME/lib/$SYSTYPE -lhadesstd -llvme -lrt -ltk -lX11 -ltcl -lm" - export INCLUDES="-I/usr/local/include -I$HOME/include" + export LOADLIBES="-L/usr/local/lib/ -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llvme -lrt -ltk -lX11 -ltcl -lm" + export INCLUDES="-I/usr/local/include -I$HOME/include -I$HOME/include/tcl" export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM" elif test $HADAQ_CONF = "LINUX" then @@ -40,22 +40,22 @@ elif test $HADAQ_CONF = "LINUX_E128" then export CC="gcc" export RPCGEN="rpcgen" - export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme" - export INCLUDES="-I$HOME/include" + export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme" + export INCLUDES="-I$HOME/include -I$HOME/include/tcl" export DEFINES="-UNDEBUG -DLVME_SOFTSWAP -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM" elif test $HADAQ_CONF = "LYNXOS" then export CC="gcc" export RPCGEN="rpcgen" - export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltcl -lm -lrpc -lnetinet -L$HOME/ATM/lib -latm -L/lib/ces -lvme -lbma -luio" + export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme -ltcl -lm -lrpc -lnetinet -L$HOME/ATM/lib -latm -L/lib/ces -lvme -lbma -luio" export INCLUDES="-I/usr/local/include -I$HOME/include -I$HOME/include/tcl" export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT" elif test $HADAQ_CONF = "LYNXOS_E7" then export CC="gcc" export RPCGEN="rpcgen" - export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet ../*.o" - export INCLUDES="-I/usr/local/include -I$HOME/include" + export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llvme -ltcl -lm -lrpc -lnetinet ../*.o" + export INCLUDES="-I/usr/local/include -I$HOME/include -I$HOME/include/tcl" export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DNOATM" else echo "Unknown HADAQ_CONF: $HADAQ_CONF, not set." >&2 -- 2.43.0