X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=conf%2FGeneralDef;h=89bc671463437e8d336673ae75ce82b9e667277b;hb=47696e4ff0787a95414e331735e4afee821c7be8;hp=753357c7b5a7844054ca8840adcb6fc3b1c4da17;hpb=e223df2c4e20a85193742a0ce17f7b0798739c1e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/conf/GeneralDef b/conf/GeneralDef
index 753357c7b5a..89bc6714634 100644
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -1,19 +1,39 @@
+# $Id$
+ 
 ##### RULES #####
  
 .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 $@)
 	@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
+else
+	$(CXX) $(CXXFLAGS) -c $*.cxx -o tgt_$(ALICE_TARGET)/$*.o
+endif
 
 # IRST coding rule check 
 check/%.i : %.cxx
@@ -21,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
 
@@ -47,39 +66,27 @@ 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 -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))
 
 # Alice libraries
 
 ALILIBS	      = -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
-                -lITS -lPHOSdummy -lPHOS -lCASTOR -lRICH -lZDC -lSTRUCT \
-                -lTGeant3 -lSTART -lEVGEN -lSTEER
+                -lITS -lPHOS -lCASTOR -lRICH -lEMCAL -lZDC -lSTRUCT \
+                -lTGeant3 -lSTART -lEVGEN -lSTEER -lCONTAINERS
 
-# Graphic libraries
-
-ROOTGLIBS     = -lGpad -lGui -lGX11 -lX3d  -lXpm
- 
 # CERN Libraries 
 
 CLIBS         = -lminicern
-G3LIBS        = -lgeant321
-
-
-
-
-
-
-
-
-
 
+G3LIBS        = -lgeant321