Module CONTAINERS added

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

diff --git a/conf/GeneralDef b/conf/GeneralDef
index 72beeff74800ebddafc5b881f4073a478c54592d..aff47c746cd855881af5d3e065ea421cdefafd9d 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -5,9 +5,13 @@
 .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.RuleChecker
+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 $@)
@@ -15,7 +19,11 @@ $(ALICE_ROOT)/include/%.h : %.h
  
 tgt_$(ALICE_TARGET)/%.o : %.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,12 +31,8 @@ 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
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
@@ -49,30 +53,25 @@ 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))
 
 # Alice libraries
 
 ALILIBS              = -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
-                -lITS -lPHOSdummy -lPHOS -lCASTOR -lRICH -lZDC -lSTRUCT \
-                -lTGeant3 -lSTART -lCPV -lEVGEN -lSTEER
-
-# Graphic libraries
+                -lITS -lPHOS -lCASTOR -lRICH -lZDC -lSTRUCT \
+                -lTGeant3 -lSTART -lEVGEN -lSTEER -lCONTAINERS
 
-ROOTGLIBS     = -lGpad -lGui -lGX11 -lX3d  -lXpm
- 
 # CERN Libraries 
 
 CLIBS         = -lminicern
 
 G3LIBS        = -lgeant321
+