New makefiles for OSF and Solaris, compatibility changes in the others

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

diff --git a/conf/GeneralDef b/conf/GeneralDef
index 802e3923eb7cb90063cda6d308c45dda674baf71..ad8d65834f51ef4507115da4fd22c28dcadaa960 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -1,10 +1,12 @@
+# $Id$
+ 
 ##### RULES #####
  
 .SUFFIXES: .cxx .h
 
 # IRST coding rule check
 STRIP=$(ALICE)/local/IRST/syntax/strip-cpp.prl
-CODE_CHECK=java syntax.CPPParser
+CODE_CHECK=java rules.RuleChecker
 export CLASSPATH=$(ALICE)/local/IRST
 
 $(ALICE_ROOT)/include/%.h : %.h
@@ -47,28 +49,24 @@ 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
 
 # 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
 
-ROOTGLIBS     = -lGpad -lGui -lGX11 -lX3d  -lXpm
- 
 # CERN Libraries 
 
 CLIBS         = -lminicern
+
 G3LIBS        = -lgeant321
+