--- yoda/techmodel/Makefile.am	2004/10/17 12:28:38	2.2
+++ yoda/techmodel/Makefile.am	2005/05/28 08:30:11	4.2
@@ -1,49 +1,56 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo
-INCLUDES = -I@top_srcdir@ -I@top_srcdir@/event @ROOT_INCLUDES@
-LDFLAGS = @ROOT_LDFLAGS@ 
+INCLUDES = -I@top_srcdir@ -I@top_srcdir@/event @ROOT_INCLUDES@ @LOG4CXX_INCLUDES@
+LDFLAGS = @ROOT_LDFLAGS@ @LOG4CXX_LDFLAGS@
 SUBDIRS = forroutines physics
 
-bin_PROGRAMS = techmodelreader
-techmodelreader_SOURCES = techmodelreader.cpp 
-techmodelreader_LDADD = libyodatechmodel.la @top_srcdir@/event/libyoda.la
+bin_PROGRAMS = yoda
+yoda_SOURCES = techmodelreader.cpp 
+yoda_LDADD = libyodatechmodel.la @top_srcdir@/event/libyoda.la
 
 lib_LTLIBRARIES = libyodatechmodel.la
 
 #LinkDef.h MUST be the last one of the list!!!!!
 libyodatechmodel_la_SOURCES = TechmodelPamelaRun.cpp  TechmodelPamelaRun.h	\
- TechmodelAlgorithm.cpp TechmodelAlgorithm.h	            \
+ TechmodelAlgorithm.cpp TechmodelAlgorithm.h                                    \
  EventReader.cpp        EventReader.h               ReaderAlgorithms.h		\
  PhysEndRunReader.cpp   CalibCalPulse1Reader.cpp    CalibCalPulse2Reader.cpp    \
- PhysicsReader.cpp	CalibTrkBothReader.cpp      CalibTrk1Reader.cpp		\
- CalibTrk2Reader.cpp    CalibTrdReader.cpp                                      \
+ PhysicsReader.cpp	CalibTrk1Reader.cpp         CalibTrk2Reader.cpp         \
  CalibTofReader.cpp     CalibS4Reader.cpp           CalibCalPedReader.cpp       \
- CalibAcReader.cpp      RunHeaderReader.cpp         RunTrailerReader.cpp        \
+ Calib1_Ac1Reader.cpp   Calib1_Ac2Reader.cpp        Calib2_Ac1Reader.cpp        Calib2_Ac2Reader.cpp \
+ RunHeaderReader.cpp    RunTrailerReader.cpp                                    \
  CalibHeaderReader.cpp  CalibTrailerReader.cpp      InitHeaderReader.cpp        \
  InitTrailerReader.cpp  EventTrkReader.cpp          TestTrkReader.cpp           \
  TestTofReader.cpp      LogReader.cpp               VarDumpReader.cpp           \
  ArrDumpReader.cpp      TabDumpReader.cpp           TmtcReader.cpp              \
- McmdReader.cpp         ForcedFECmdReader.cpp       AcInitReader.cpp            \
+ McmdReader.cpp         ForcedFECmdReader.cpp                                   \
+ Ac1InitReader.cpp      Ac2InitReader.cpp                                       \
  CalInitReader.cpp      TrkInitReader.cpp           TofInitReader.cpp           \
- TrgInitReader.cpp      NdInitReader.cpp                                        \
+ TrgInitReader.cpp      NdInitReader.cpp            S4InitReader.cpp            \
  CalAlarmReader.cpp     AcAlarmReader.cpp                                       \
  TrkAlarmReader.cpp     TrgAlarmReader.cpp          TofAlarmReader.cpp          \
- TechmodelFilter.cpp    TechmodelFilter.h \
+ S4AlarmReader.cpp      TsbTReader.cpp              TsbBReader.cpp              \
+ TechmodelFilter.cpp    TechmodelFilter.h                                       \
  TechmodelDict.cpp      TechmodelDict.h             LinkDef.h
  
 
 libyodatechmodel_la_LIBADD = \
- @top_srcdir@/event/libyoda.la \
- @top_srcdir@/event/physics/tracker/libtrackerevent.la \
- @top_srcdir@/event/physics/anticounter/libanticounterevent.la \
- @top_srcdir@/event/physics/calorimeter/libcalorimeterevent.la \
- @top_srcdir@/event/physics/neutronDetector/libneutronevent.la \
- @top_srcdir@/event/tmtc/libtmtcevent.la \
- @top_srcdir@/event/mcmd/libmcmdevent.la \
- @top_srcdir@/event/log/liblogevent.la \
- @top_srcdir@/event/arrDump/libarrdumpevent.la \
- @top_srcdir@/event/tabDump/libtabdumpevent.la \
- @top_srcdir@/event/varDump/libvardumpevent.la \
- forroutines/libforrou.la \
+ @top_srcdir@/event/libyoda.la                                  \
+ @top_srcdir@/event/physics/tracker/libtrackerevent.la          \
+ @top_srcdir@/event/physics/anticounter/libanticounterevent.la  \
+ @top_srcdir@/event/physics/calorimeter/libcalorimeterevent.la  \
+ @top_srcdir@/event/physics/neutronDetector/libneutronevent.la  \
+ @top_srcdir@/event/physics/tof/libtofevent.la                  \
+ @top_srcdir@/event/physics/trigger/libtriggerevent.la          \
+ @top_srcdir@/event/tmtc/libtmtcevent.la                        \
+ @top_srcdir@/event/mcmd/libmcmdevent.la                        \
+ @top_srcdir@/event/log/liblogevent.la                          \
+ @top_srcdir@/event/arrDump/libarrdumpevent.la                  \
+ @top_srcdir@/event/tabDump/libtabdumpevent.la                  \
+ @top_srcdir@/event/varDump/libvardumpevent.la                  \
+ @top_srcdir@/event/tsbt/libtsbtevent.la                        \
+ @top_srcdir@/event/tsbb/libtsbbevent.la                        \
+ @top_srcdir@/event/endrun/libendrunevent.la                    \
+ forroutines/libforrou.la                                       \
  physics/libdevreaders.la
 
 BUILT_SOURCES = TechmodelDict.cpp TechmodelDict.h