Avoid linking with pythia when not needed
authoralibrary <alibrary@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 16 Jun 2005 11:43:24 +0000 (11:43 +0000)
committeralibrary <alibrary@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 16 Jun 2005 11:43:24 +0000 (11:43 +0000)
MONITOR/binmonitorCheck.pkg
MONITOR/binmonitorGDC.pkg
MONITOR/monitorCheck.cxx
MONITOR/monitorGDC.cxx
RAW/binalimdc.pkg

index 58fd3de..04e1c17 100644 (file)
@@ -16,22 +16,15 @@ EINCLUDE+=TPC CONTAINERS ITS RAW HLT/src HLT/hough HLT/comp HLT/ITS
 ifdef DATE_ROOT
 
 ELIBSDIR:=${DATE_MONITOR_DIR}/${DATE_SYS}
-ELIBS:= ESD STEER CONTAINERS RAWData monitor shift pythia6 pdf microcern TPCbase TPCsim TPCrec ITS AliL3Src AliL3Comp AliL3Misc AliL3Hough AliL3ITS
+ELIBS:= ESD STEER CONTAINERS RAWData monitor shift TPCbase TPCsim TPCrec ITS AliL3Src AliL3Comp AliL3Misc AliL3Hough AliL3ITS
 EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR}
 
 else
 
-ELIBS:= pythia6 pdf microcern
+PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS)
 
 endif
 
 ifneq (,$(findstring macosx,$(ALICE_TARGET)))
-@PACKAGE@LIBSINIT:=$(filter-out microcern,$(ELIBS))
-@PACKAGE@LIBSINIT:=$(filter-out pdf,$(@PACKAGE@LIBSINIT))
-PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%)
-# On Mac OS X gcc we need g2c for versions before 10.4
-ifneq ($(MACOSX_MINOR),4)
-ELIBS+=g2c
-ELIBSDIR+=$(dir $(shell find $(FINK_ROOT) -name 'libg2c.*'))
-endif
+PACKLDFLAGS:=$(LDFLAGS) $(ELIBS:%=-Wl,-u,_G__cpp_setupG__%)
 endif
index 1c6fdea..35886c6 100644 (file)
@@ -16,11 +16,15 @@ EINCLUDE+=TPC CONTAINERS ITS RAW HLT/src HLT/hough HLT/comp HLT/ITS
 ifdef DATE_ROOT
 
 ELIBSDIR:=${DATE_MONITOR_DIR}/${DATE_SYS}
-ELIBS:=ESD STEER RAWData TPCbase TPCsim TPCrec CONTAINERS AliL3Src AliL3Misc AliL3Hough AliL3Comp AliL3ITS ITS monitor shift pythia6 pdf microcern
+ELIBS:=ESD STEER RAWData TPCbase TPCsim TPCrec CONTAINERS AliL3Src AliL3Misc AliL3Hough AliL3Comp AliL3ITS ITS monitor shift
 EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR}
 
 else
 
-ELIBS:= pythia6 pdf microcern
+PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS)
 
 endif
+
+ifneq (,$(findstring macosx,$(ALICE_TARGET)))
+PACKLDFLAGS:=$(LDFLAGS) $(ELIBS:%=-Wl,-u,_G__cpp_setupG__%)
+endif
index 0fffd5a..2b75ebc 100644 (file)
 #include "monitor.h"
 #endif
 
-#ifdef __APPLE__
-// avoid loading pythia and pdf
-#include <Hepevt.h>
-HEPEVT_DEF HEPEVT;
-#endif
-
 //_____________________________________________________________________________
 class AliGDCInterruptHandler : public TSignalHandler {
 public:
index 9dcb358..dc0c925 100644 (file)
 #include <AliL3ITStracker.h>
 #endif
 
-#ifdef __APPLE__
-// avoid loading pythia and pdf
-#include <Hepevt.h>
-HEPEVT_DEF HEPEVT;
-#endif
-
 //_____________________________________________________________________________
 class AliGDCInterruptHandler : public TSignalHandler {
 public:
index ee56ad3..3e43387 100644 (file)
@@ -9,8 +9,6 @@ PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 SRCS:= alimdc_main.cxx ${ESRCS}
 
-#EDEFINE+= -DUSE_EB
-
 EINCLUDE+=TPC CONTAINERS ITS RAW HLT/src HLT/hough HLT/comp HLT/ITS
 # -DUSE_DEBUG for alimdc debug printout