Thread libraries filtered out

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

diff --git a/conf/GeneralDef b/conf/GeneralDef
index abad626d04f781cc9d3e06e127526099101d8d92..89bc671463437e8d336673ae75ce82b9e667277b 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -5,15 +5,29 @@
 .SUFFIXES: .cxx .h
 
 # IRST coding rule check
-STRIP=$(ALICE)/local/IRST/syntax/strip-cpp.prl
+export IRST_INSTALLDIR=$(ALICE)/local/IRST
+export CLASSPATH=$(IRST_INSTALLDIR)
 CODE_CHECK=java rules.RuleChecker
-export CLASSPATH=$(ALICE)/local/IRST
+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 -O%, $(CXXFLAGS)) -c $*Cint.cxx -o tgt_$(ALICE_TARGET)/$*Cint.o
+else
+       $(CXX) $(filter-out -O%, $(CXXFLAGS)) -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
@@ -27,22 +41,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
 
@@ -61,12 +74,15 @@ MAKEDEPEND    = $(ROOTSYS)/bin/rmkdepend
 # Root libraries
  
 ROOTLIBS      = $(shell $(ROOTSYS)/bin/root-config --glibs) -lMinuit -lHtml
+ROOTLIBS      := $(filter-out -lNew,$(ROOTLIBS))
+ROOTLIBS      := $(filter-out -lThread,$(ROOTLIBS))
+ROOTLIBS      := $(filter-out -lpthread,$(ROOTLIBS))
 
 # Alice libraries
 
 ALILIBS              = -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
-                -lITS -lPHOS -lCASTOR -lRICH -lZDC -lSTRUCT \
-                -lTGeant3 -lSTART -lEVGEN -lSTEER
+                -lITS -lPHOS -lCASTOR -lRICH -lEMCAL -lZDC -lSTRUCT \
+                -lTGeant3 -lSTART -lEVGEN -lSTEER -lCONTAINERS
 
 # CERN Libraries