Combine TEPEMGEN and EPEMGEN in one library to avoid circular dependences. Compilatio...
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 2 Apr 2008 19:19:11 +0000 (19:19 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 2 Apr 2008 19:19:11 +0000 (19:19 +0000)
ALIROOT/binaliroot.pkg
EPEMGEN/libEPEMGEN.pkg [deleted file]
EVE/binalieve.pkg
Makefile
TEPEMGEN/diffcross.f [moved from EPEMGEN/diffcross.f with 100% similarity]
TEPEMGEN/dtrint.f [moved from EPEMGEN/dtrint.f with 100% similarity]
TEPEMGEN/epemgen.f [moved from EPEMGEN/epemgen.f with 100% similarity]
TEPEMGEN/libTEPEMGEN.pkg
build/module.dep

index 94f4646..a79d73f 100644 (file)
@@ -21,7 +21,7 @@ ELIBS:= MUONcore MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONc
         FASTSIM microcern \
        RAWDatabase RAWDatarec RAWDatasim \
        HLTbase MUONevaluation \
-# TMEVSIM mevsim THbtp HBTP TEPEMGEN EPEMGEN \
+# TMEVSIM mevsim THbtp HBTP TEPEMGEN \
 #      THerwig herwig TPHIC
 
 ifeq (macosx,$(ALICE_TARGET))
@@ -31,7 +31,6 @@ ELIBSCPP:=$(filter-out lhapdf,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out mevsim,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out HBTP,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out herwig,$(ELIBSCPP))
-ELIBSCPP:=$(filter-out EPEMGEN,$(ELIBSCPP))
 PACKLDFLAGS:=$(LDFLAGS) $(ELIBSCPP:%=-Wl,-u,_G__cpp_setupG__%)
 # On Mac OS X gcc we need f2c
 ELIBS+=f2c
@@ -107,6 +106,6 @@ ARLIBS:= \
    RAW/tgt_$(ALICE_TARGET)/G__RAWDatarec.o $(LIBPATH)/libRAWDatarec.a \
    RAW/tgt_$(ALICE_TARGET)/G__MDC.o $(LIBPATH)/libMDC.a
 
-#SHLIBS:= $(BINLIBDIRS) -lEVGEN -lEGPythia6 -lPythia6 -lpythia6 -lAliPythia6 -llhapdf -lTHijing -lhijing -lTMEVSIM -lmevsim -lTHbtp -lHBTP -lTHerwig -lherwig -lTEPEMGEN -lEPEMGEN -lTPHIC -lFASTSIM -lmicrocern
+#SHLIBS:= $(BINLIBDIRS) -lEVGEN -lEGPythia6 -lPythia6 -lpythia6 -lAliPythia6 -llhapdf -lTHijing -lhijing -lTMEVSIM -lmevsim -lTHbtp -lHBTP -lTHerwig -lherwig -lTEPEMGEN -lTPHIC -lFASTSIM -lmicrocern
 SHLIBS:= $(BINLIBDIRS) -lEVGEN -lEGPythia6 -lPythia6 -lpythia6 -lAliPythia6 -llhapdf -lTHijing -lhijing -lTHerwig -lherwig -lTPHIC -lFASTSIM -lmicrocern
 
diff --git a/EPEMGEN/libEPEMGEN.pkg b/EPEMGEN/libEPEMGEN.pkg
deleted file mode 100644 (file)
index f29b771..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-CSRCS:=
-
-FSRCS:= \
-epemgen.f diffcross.f dtrint.f
-
-PACKFFLAGS      := $(filter-out -O%,$(FFLAGS))
index c7339d7..4304ff1 100644 (file)
@@ -19,7 +19,7 @@ ELIBS    := EveBase EveDet EveHLT \
   EMCALbase EMCALsim EMCALrec EMCALjet BCM \
   STRUCT T0base T0sim T0rec EVGEN STEERBase ESD AOD CDB STEER \
   THijing \
-  hijing TMEVSIM mevsim THbtp HBTP TEPEMGEN EPEMGEN \
+  hijing TMEVSIM mevsim THbtp HBTP TEPEMGEN \
   FASTSIM microcern \
   RAWDatabase RAWDatarec RAWDatasim \
   HLTbase XMLParser
@@ -38,7 +38,6 @@ ELIBSCPP:=$(filter-out lhapdf,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out mevsim,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out HBTP,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out herwig,$(ELIBSCPP))
-ELIBSCPP:=$(filter-out EPEMGEN,$(ELIBSCPP))
 PACKLDFLAGS:=$(LDFLAGS) $(ELIBSCPP:%=-Wl,-u,_G__cpp_setupG__%)
 ifeq (5,$(MACOSX_MINOR))
 # This is a bug in OS 10.5
index 39fea2f..753f8d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ endif
 ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       ACORDE HMPID T0 BCM STRUCT EVGEN RALICE VZERO \
       THijing MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
-      THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
+      THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
       JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet
 
 ifneq ($(wildcard $(ROOTSYS)/include/TPythia8.h),)
similarity index 100%
rename from EPEMGEN/diffcross.f
rename to TEPEMGEN/diffcross.f
similarity index 100%
rename from EPEMGEN/dtrint.f
rename to TEPEMGEN/dtrint.f
similarity index 100%
rename from EPEMGEN/epemgen.f
rename to TEPEMGEN/epemgen.f
index f0f0f3b..fedea62 100644 (file)
@@ -1,7 +1,20 @@
+#-*- Mode: Makefile -*-
+
 SRCS= TEpEmGen.cxx AliGenEpEmv1.cxx
 
 HDRS= TEpEmGen.h AliGenEpEmv1.h
 
 DHDR:=TEPEMGENLinkDef.h
 
+FSRCS:= \
+epemgen.f diffcross.f dtrint.f
+
+PACKFFLAGS      := $(filter-out -O%,$(FFLAGS))
+
 EXPORT:=TEpEmGen.h
+
+ifeq (win32gcc,$(ALICE_TARGET))
+PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
+                         -lSTEER -lSTEERBase -lEVGEN -lmicrocern \
+                         -L$(shell root-config --libdir) -lEG
+endif
index 600a808..c76d2d5 100644 (file)
@@ -4,7 +4,6 @@ ALIROOT/module.mk:      ALIROOT/binaliroot.pkg
 ANALYSIS/module.mk:    ANALYSIS/libANALYSIS.pkg ANALYSIS/libAnalysisOld.pkg ANALYSIS/libANALYSISRL.pkg ANALYSIS/libAliengui.pkg ANALYSIS/binaliengui.pkg
 ACORDE/module.mk:      ACORDE/libACORDEbase.pkg ACORDE/libACORDErec.pkg ACORDE/libACORDEsim.pkg
 EMCAL/module.mk:       EMCAL/libEMCALbase.pkg EMCAL/libEMCALsim.pkg EMCAL/libEMCALrec.pkg EMCAL/libEMCALjet.pkg
-EPEMGEN/module.mk:     EPEMGEN/libEPEMGEN.pkg
 EVGEN/module.mk:       EVGEN/libEVGEN.pkg
 FMD/module.mk:         FMD/libFMDbase.pkg FMD/libFMDsim.pkg FMD/libFMDrec.pkg FMD/libFMDutil.pkg FMD/libFMDflow.pkg
 FASTSIM/module.mk:     FASTSIM/libFASTSIM.pkg
@@ -135,4 +134,5 @@ $(LIBPATH)/libEMCALsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/lib
 $(LIBPATH)/libEMCALrec.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libEMCALBase.$(SOEXT)
 $(LIBPATH)/libEMCALjet.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libEMCALBase.$(SOEXT) $(LIBPATH)/libmicrocern.$(SOEXT)
 $(LIBPATH)/libBCM.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT)
+$(LIBPATH)/libTEPEMGEN.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libEVGEN.$(SOEXT) $(LIBPATH)/libmicrocern.$(SOEXT)
 endif