Merging the VirtualMC branch to the main development branch (HEAD)

[u/mrichter/AliRoot.git] / conf / GeneralDef

diff --git a/conf/GeneralDef b/conf/GeneralDef
index 067ca60f78def8d31b724276e75e216e5e3c7932..b3f3da21cdcb788a941720448e78fe8ffb4c1a10 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -7,12 +7,13 @@
 # IRST coding rule check
 export IRST_INSTALLDIR=$(ALICE)/local/IRST
 export CLASSPATH=$(IRST_INSTALLDIR)
-CODE_CHECK=java rules.RuleChecker
+CODE_CHECK=java rules.ALICE.ALICERuleChecker
 REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 # This is to avoid a problem with the declaration of .SECONDARY in the 
 # GeneralMacros
 CHECKS = none
 
+
 $(ALICE_ROOT)/include/%.h : %.h
        @[ -d $(dir $@) ] || mkdir $(dir $@)
        @cp -p $? $(ALICE_ROOT)/include
@@ -77,12 +78,25 @@ ROOTLIBS      = $(shell $(ROOTSYS)/bin/root-config --glibs) -lMinuit -lHtml
 ROOTLIBS      := $(filter-out -lNew,$(ROOTLIBS))
 ROOTLIBS      := $(filter-out -lThread,$(ROOTLIBS))
 ROOTLIBS      := $(filter-out -lpthread,$(ROOTLIBS))
+ROOTLIBS      += -lMC 
 
 # Alice libraries
 
-ALILIBS              = -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
-                -lITS -lPHOS -lCASTOR -lRICH -lEMCAL -lZDC -lSTRUCT \
-                -lTGeant3 -lSTART -lVZERO -lEVGEN -lSTEER -lCONTAINERS
+#ALILIBS             = -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
+#                -lITS -lPHOS -lCASTOR -lRICH -lEMCAL -lZDC -lSTRUCT \
+#                -lTGeant3 -lSTART -lEVGEN -lSTEER -lCONTAINERS
+
+# with geant3
+#ALILIBS       = -L$(LIBDIR) -L$(G3INSTALL)/lib/tgt_Linux \
+#                -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
+#                -lITS -lPHOS -lCASTOR -lRICH -lEMCAL -lZDC -lSTRUCT \
+#                -lgeant321 -lEVGEN -lSTEER -lCONTAINERS  
+
+# without geant3
+ALILIBS        = -L$(LIBDIR) -L$(G3INSTALL)/lib/tgt_Linux \
+                 -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
+                 -lPHOS -lCASTOR -lRICH -lEMCAL -lZDC -lSTRUCT \
+             -lSTART -lEVGEN -lSTEER -lCONTAINERS
 
 # CERN Libraries