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 97a3d4ff4ad4920ee90e144ef7fd653ae3cf6f77..b3f3da21cdcb788a941720448e78fe8ffb4c1a10 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -5,17 +5,36 @@
 .SUFFIXES: .cxx .h
 
 # IRST coding rule check
-STRIP=$(ALICE)/local/IRST/syntax/strip-cpp.prl
-CODE_CHECK=java syntax.CPPParser
-export CLASSPATH=$(ALICE)/local/IRST
+export IRST_INSTALLDIR=$(ALICE)/local/IRST
+export CLASSPATH=$(IRST_INSTALLDIR)
+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
  
+tgt_$(ALICE_TARGET)/%Cint.o : %Cint.cxx
+       @echo $*Cint.cxx
+       @[ -d $(dir $@) ] || mkdir -p $(dir $@)
+ifeq ($(CXXVERBOSE),)
+       @$(CXX) $(filter-out -prof_gen, $(filter-out -O%, $(CXXFLAGS))) -O0 -c $*Cint.cxx -o tgt_$(ALICE_TARGET)/$*Cint.o
+else
+       $(CXX) $(filter-out -prof_gen, $(filter-out -O%, $(CXXFLAGS))) -O0 -c $*Cint.cxx -o tgt_$(ALICE_TARGET)/$*Cint.o
+endif
+
 tgt_$(ALICE_TARGET)/%.o : %.cxx
+       @echo $*.cxx
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
+ifeq ($(CXXVERBOSE),)
        @$(CXX) $(CXXFLAGS) -c $*.cxx -o tgt_$(ALICE_TARGET)/$*.o
+else
+       $(CXX) $(CXXFLAGS) -c $*.cxx -o tgt_$(ALICE_TARGET)/$*.o
+endif
 
 # IRST coding rule check 
 check/%.i : %.cxx
@@ -23,22 +42,21 @@ check/%.i : %.cxx
        @$(CXX) -E $(CXXFLAGS) $*.cxx > check/$*.i
 
 # IRST coding rule check
-check/%.ii : check/%.i
-       @$(STRIP) check/$*.i > check/$*.ii
-
-# IRST coding rule check
-check/%.viol : check/%.ii
-       @$(CODE_CHECK) check/$*.ii ./ > check/$*.viol
+check/%.viol : check/%.i
+       @$(CODE_CHECK) check/$*.i ./ > check/$*.viol
 
 tgt_$(ALICE_TARGET)/%.o : %.c
+       @echo $*.c
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
        @$(CC) $(CFLAGS) -c $*.c -o tgt_$(ALICE_TARGET)/$*.o
 
 tgt_$(ALICE_TARGET)/%.o : %.f
+       @echo $*.f
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
        @$(F77) $(FFLAGS) -c $*.f -o tgt_$(ALICE_TARGET)/$*.o
 
 tgt_$(ALICE_TARGET)/%.o : %.F
+       @echo $*.F
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
        @$(F77) $(FFLAGS) -c $*.F -o tgt_$(ALICE_TARGET)/$*.o
 
@@ -49,34 +67,40 @@ BINDIR = $(ALICE_ROOT)/bin/tgt_$(ALICE_TARGET)
 
 # Current Version
 
-VERSION                = 3.02pre
+VERSION                = 3.03pre
  
 # Which makedepend
-MAKEDEPEND    = $(ROOTSYS)/bin/makedepend
+MAKEDEPEND    = $(ROOTSYS)/bin/rmkdepend
 
 # Root libraries
  
-ROOTLIBS      = -L$(ROOTSYS)/lib -lNew -lBase -lCint -lClib -lCont -lFunc \
-               -lGraf -lGraf3d -lHist -lHtml -lMeta -lMinuit -lNet \
-               -lPostscript -lProof -lRint -lTree -lUnix -lZip -lMatrix \
-               -lMeta -lPhysics
+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 -lPHOSdummy -lPHOS -lCASTOR -lRICH -lZDC -lSTRUCT \
-                -lTGeant3 -lSTART -lCPV -lEVGEN -lSTEER
+#ALILIBS             = -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
+#                -lITS -lPHOS -lCASTOR -lRICH -lEMCAL -lZDC -lSTRUCT \
+#                -lTGeant3 -lSTART -lEVGEN -lSTEER -lCONTAINERS
 
-# Graphic libraries
+# 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
 
-ROOTGLIBS     = -lGpad -lGui -lGX11 -lX3d  -lXpm
- 
 # CERN Libraries 
 
-ifeq ($(PLATFORM),alpha)
-CLIBS         = $(LIBDIR)/libminicern.a
-else
 CLIBS         = -lminicern
-endif
 
 G3LIBS        = -lgeant321
+