*** empty log message ***

diff --git a/hadaq/Makefile b/hadaq/Makefile
index f2efc227e4ce5b054449b4cd01864408d000e7c5..2d84e5f6aff342cdf063f1504da9eba90a7225f8 100644 (file)
--- a/hadaq/Makefile
+++ b/hadaq/Makefile
@@ -24,19 +24,18 @@ DAQ_READOUT_OBJS = readout.o \
        $(HW_OBJS) param.o subevt.o \
        shmtrans.o semaphore.o hadtuqueue.o \
                psxshm.o mman.o \
-               hadtu.o \
-               latm.o
+               hadtu.o
 DAQ_MEMNET_OBJS = memnet.o \
        worker.o \
        shmtrans.o semaphore.o hadtuqueue.o \
                psxshm.o mman.o \
-       nettrans.o pkt.o latm.o \
+       nettrans.o pkt.o \
                hadtu.o
 DAQ_NETMEM_OBJS = netmem.o \
        worker.o \
        shmtrans.o semaphore.o hadtuqueue.o \
                psxshm.o mman.o \
-       nettrans.o pkt.o latm.o \
+       nettrans.o pkt.o \
                hadtu.o
 DAQ_EVTBUILD_OBJS = evtbuild.o \
        worker.o \
@@ -94,9 +93,6 @@ clean:
        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
-
 online_clnt.c: online.x
        $(RPCGEN) -l online.x >online_clnt.c
 
@@ -144,13 +140,12 @@ hwsam.o: hwsam.c sam_defs.h hwsam.h param.h
 hwship.o: hwship.c param.h ipc_basis.h hwship.h
 hwshow.o: hwshow.c param.h subevt.h hadtu.h hwship.h hardware.h
 hwsoft.o: hwsoft.c subevt.h hadtu.h param.h hardware.h
-latm.o: latm.c
 memnet.o: memnet.c shmtrans.h psxshm.h hadtuqueue.h hadtu.h nettrans.h \
  worker.h
 mman.o: mman.c
 netmem.o: netmem.c worker.h psxshm.h nettrans.h hadtu.h shmtrans.h \
  hadtuqueue.h
-nettrans.o: nettrans.c grmblfx.h latm.h hadtu.h pkt.h worker.h \
+nettrans.o: nettrans.c grmblfx.h hadtu.h pkt.h worker.h \
  psxshm.h nettrans.h
 online.o: online.c evt.h hadtu.h subevt.h online.h
 online_clnt.o: online_clnt.c online.h

diff --git a/hadaq/makeenv b/hadaq/makeenv
index 39c774976063bfc82190def02bb6b73a77d52490..fe4aeb36902407bb2e460ea3d96fc89bfa48b4a0 100644 (file)
--- a/hadaq/makeenv
+++ b/hadaq/makeenv
@@ -26,7 +26,7 @@ elif test $HADAQ_CONF = "LYNXOS"
 then
        export CC="gcc"
        export RPCGEN="rpcgen"
-       export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet -L/usr/ATM/lib -latm -L/lib/ces -lvme -lbma -luio"
+       export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -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"

diff --git a/hadaq/netmem.c b/hadaq/netmem.c
index 4b516c44fbee6b8ec2c655b9b7b942c9dbc4c743..fdfe6547b63ceeec13842333088042684559799e 100644 (file)
--- a/hadaq/netmem.c
+++ b/hadaq/netmem.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.7 2000-02-18 13:44:54 muench Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.8 2000-03-07 12:42:17 muench Stab $";
 
 #define _XOPEN_SOURCE
 #include <unistd.h>
@@ -90,6 +90,8 @@ int main(int argc, char *argv[])
     exit(EXIT_FAILURE);
   }
   for (i = 0; i < nrOfMsgs; i++) {
+       char buf[80];
+
     netTrans[i] = NetTrans_create(inPath[i], 0, worker);
     if (netTrans[i] == NULL) {
         msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno));

diff --git a/hadaq/nettrans.c b/hadaq/nettrans.c
index 73363063b6ac1ae7bf8889c55de8802ec57e42ee..43dce2a0eeb8c962b0dddcadf1eaab6a02d75adf 100644 (file)
--- a/hadaq/nettrans.c
+++ b/hadaq/nettrans.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.10 2000-02-18 13:40:12 muench Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.11 2000-03-07 12:42:17 muench Stab $";
 
 #define _XOPEN_SOURCE_EXTENDED
 #include <unistd.h>
@@ -17,8 +17,7 @@ static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/had
 #include <sys/types.h>
 
 #include <hadesstd.h>
-
-#include "latm.h"
+#include <latm.h>
 
 #include "hadtu.h"
 #include "pkt.h"

diff --git a/hadaq/nettrans.h b/hadaq/nettrans.h
index 68c4df2a3a05e5312e390e12371ec5880e87ab3b..42f706051b4a9abbbbcf8ff23e5ae215a48d17a0 100644 (file)
--- a/hadaq/nettrans.h
+++ b/hadaq/nettrans.h
@@ -2,8 +2,8 @@
 #define NETTRANS_H
 
 #include <hadesstd.h>
+#include <latm.h>
 
-#include "latm.h"
 #include "worker.h"
 #include "hadtu.h"