Changes for compatibility with version 2.23 of ROOT

diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx
index d63c598..e56df0b 100644 (file)
--- a/EVGEN/AliGenExtFile.cxx
+++ b/EVGEN/AliGenExtFile.cxx
@@ -15,8 +15,13 @@
 
 /*
 $Log$
+Revision 1.5  1999/09/29 09:24:12  fca
+Introduction of the Copyright and cvs Log
+
 */
 
+#include <iostream.h>
+
 #include "AliGenExtFile.h"
 #include "AliGenMUONlib.h"
 #include "AliMC.h"

diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx
index 48f4e3c..1afc23a 100644 (file)
--- a/EVGEN/AliGenParam.cxx
+++ b/EVGEN/AliGenParam.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.13  1999/11/04 11:30:31  fca
+Correct the logics for SetForceDecay
+
 Revision 1.12  1999/11/03 17:43:20  fca
 New version from G.Martinez & A.Morsch
 
@@ -224,7 +227,7 @@ void AliGenParam::Generate()
 // particle type
          Int_t Ipart = fIpParaFunc();
          fChildWeight=(fPythia->GetBraPart(Ipart))*fParentWeight;        
-         Float_t am=fPythia->GetPMAS(fPythia->LuComp(Ipart),1);
+         Float_t am=fPythia->GetPMAS(fPythia->Lucomp(Ipart),1);
          gMC->Rndm(random,2);
 //
 // phi

diff --git a/EVGEN/AliGenPythia.cxx b/EVGEN/AliGenPythia.cxx
index 7a96313..7a29402 100644 (file)
--- a/EVGEN/AliGenPythia.cxx
+++ b/EVGEN/AliGenPythia.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.12  1999/11/03 17:43:20  fca
+New version from G.Martinez & A.Morsch
+
 Revision 1.11  1999/09/29 09:24:14  fca
 Introduction of the Copyright and cvs Log
 */
@@ -72,8 +75,8 @@ void AliGenPythia::Init()
     fPythia->SetCKIN(4,fPtHardMax);    
     fPythia->ProcInit(fProcess,fEnergyCMS,fStrucFunc);
     fPythia->ForceDecay(fForceDecay);
-    fPythia->LuList(0);
-    fPythia->PyStat(2);
+    fPythia->Lulist(0);
+    fPythia->Pystat(2);
 //  Parent and Children Selection
     switch (fProcess) 
     {
@@ -171,7 +174,7 @@ void AliGenPythia::Generate()
     }
     while(1)
     {
-       fPythia->PyEvnt();
+       fPythia->Pyevnt();
        fTrials++;
        fPythia->ImportParticles(particles,"All");
        Int_t np = particles->GetEntriesFast();

diff --git a/EVGEN/AliPythia.cxx b/EVGEN/AliPythia.cxx
index 0cd2b9d..d3b541d 100644 (file)
--- a/EVGEN/AliPythia.cxx
+++ b/EVGEN/AliPythia.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.5  1999/11/03 17:43:20  fca
+New version from G.Martinez & A.Morsch
+
 Revision 1.4  1999/09/29 09:24:14  fca
 Introduction of the Copyright and cvs Log
 
@@ -70,7 +73,7 @@ void AliPythia::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfun
     fEcms = energy;
     fStrucFunc = strucfunc;
 //  don't decay p0
-    SetMDCY(LuComp(111),1,0);
+    SetMDCY(Lucomp(111),1,0);
 //  select structure function 
     SetMSTP(52,2);
     SetMSTP(51,strucfunc);
@@ -189,7 +192,7 @@ void AliPythia::ForceParticleDecay(Int_t particle, Int_t product, Int_t mult)
 //
 //  force decay of particle into products with multiplicity mult
 
-    Int_t kc=LuComp(particle);
+    Int_t kc=Lucomp(particle);
     SetMDCY(kc,1,1);
     Int_t ifirst=GetMDCY(kc,2);
     Int_t ilast=ifirst+GetMDCY(kc,3)-1;
@@ -313,7 +316,7 @@ void AliPythia::ForceDecay(Decay_t decay)
 //
 //  phi-> mu+mu- and phi -> e+e-
 //  clone the original phi
-    kc  = LuComp(333);
+    kc  = Lucomp(333);
     nkc = 41;
     
     for (i=1;i<=3;i++) {
@@ -354,42 +357,42 @@ void AliPythia::ForceDecay(Decay_t decay)
 //          Vector mesons
 //
 // phi clone for dilepton decay-channel
-    kc=LuComp(41);         
+    kc=Lucomp(41);         
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(113,"Phi",3,mass,0,tlife);
     fGPCode[kc][0]=113;
     fGPCode[kc][1]=113;
     // J/Psi  
-    kc=LuComp(443);
+    kc=Lucomp(443);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(114,"J/Psi",3,mass,0,tlife);
     fGPCode[kc][0]=114;
     fGPCode[kc][1]=114;
     // psi prime
-    kc=LuComp(30443);
+    kc=Lucomp(30443);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(115,"Psi'",3,mass,0,tlife);
     fGPCode[kc][0]=115;
     fGPCode[kc][1]=115;
     // upsilon(1s) 
-    kc=LuComp(553);    
+    kc=Lucomp(553);    
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(116,"Upsilon",3,mass,0,tlife);
     fGPCode[kc][0]=116;
     fGPCode[kc][1]=116;
     // upsilon(2s)     
-    kc=LuComp(30553);
+    kc=Lucomp(30553);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(117,"Upsilon'",3,mass,0,tlife);
     fGPCode[kc][0]=117;
     fGPCode[kc][1]=117;
     // upsilon(3s)     
-    kc=LuComp(30553);
+    kc=Lucomp(30553);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(118,"Upsilon''",3,mass,0,tlife);
@@ -399,7 +402,7 @@ void AliPythia::ForceDecay(Decay_t decay)
 // charmed mesons
 //
     //  D^+/-
-    kc=LuComp(411);
+    kc=Lucomp(411);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(119,"D^+",3,mass, 1,tlife);
@@ -407,7 +410,7 @@ void AliPythia::ForceDecay(Decay_t decay)
     fGPCode[kc][0]=119;
     fGPCode[kc][1]=120;
     // D^0
-    kc=LuComp(421);
+    kc=Lucomp(421);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(121,"D^0",3,mass,0,tlife);
@@ -415,7 +418,7 @@ void AliPythia::ForceDecay(Decay_t decay)
     fGPCode[kc][0]=121;
     fGPCode[kc][1]=122;
     // D_s
-    kc=LuComp(431);
+    kc=Lucomp(431);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(123,"D_s^+",3,mass, 1,tlife);
@@ -423,7 +426,7 @@ void AliPythia::ForceDecay(Decay_t decay)
     fGPCode[kc][0]=123;
     fGPCode[kc][1]=124;
     // Lambda_c
-    kc=LuComp(4122);
+    kc=Lucomp(4122);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(125,"Lambda_c+",3,mass, 1,tlife);
@@ -433,7 +436,7 @@ void AliPythia::ForceDecay(Decay_t decay)
     //
     //  beauty mesons
     // B_0
-    kc=LuComp(511);
+    kc=Lucomp(511);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(127,"B^0",3,mass, 0,tlife);
@@ -441,7 +444,7 @@ void AliPythia::ForceDecay(Decay_t decay)
     fGPCode[kc][0]=127;
     fGPCode[kc][1]=128;
     // B^+-
-    kc=LuComp(521);
+    kc=Lucomp(521);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(129,"B^+",3,mass, 1,tlife);
@@ -449,7 +452,7 @@ void AliPythia::ForceDecay(Decay_t decay)
     fGPCode[kc][0]=129;
     fGPCode[kc][1]=130;
     // B_s
-    kc=LuComp(531);
+    kc=Lucomp(531);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(131,"B_s",3,mass, 0,tlife);
@@ -457,7 +460,7 @@ void AliPythia::ForceDecay(Decay_t decay)
     fGPCode[kc][0]=131;
     fGPCode[kc][1]=132;
     // Lambda_b
-    kc=LuComp(5122);
+    kc=Lucomp(5122);
     mass =GetPMAS(kc,1);
     tlife=GetPMAS(kc,4);
     gMC->Gspart(133,"Lambda_b",3,mass, 0,tlife);
@@ -468,79 +471,79 @@ void AliPythia::ForceDecay(Decay_t decay)
 //          set up correspondance between standard GEANT particle codes
 //          and PYTHIA kf
 
-    kc=LuComp(22);  // gamma
+    kc=Lucomp(22);  // gamma
     fGPCode[kc][0]=1;
     fGPCode[kc][1]=1;
     
-    kc=LuComp(11);  // positron
+    kc=Lucomp(11);  // positron
     fGPCode[kc][0]=2;
     fGPCode[kc][1]=3;
     
-    kc=LuComp(12);  // neutrino
+    kc=Lucomp(12);  // neutrino
     fGPCode[kc][0]=4;
     fGPCode[kc][1]=4;
 
-    kc=LuComp(13);  // muon
+    kc=Lucomp(13);  // muon
     fGPCode[kc][0]=5;
     fGPCode[kc][1]=6;
     
-    kc=LuComp(111); // pi0
+    kc=Lucomp(111); // pi0
     fGPCode[kc][0]=7;
     fGPCode[kc][1]=7;
 
-    kc=LuComp(211); // pi+
+    kc=Lucomp(211); // pi+
     fGPCode[kc][0]=8;
     fGPCode[kc][1]=9;
 
-    kc=LuComp(130); // K0 short
+    kc=Lucomp(130); // K0 short
     fGPCode[kc][0]=10;
     fGPCode[kc][1]=10;
 
-    kc=LuComp(321); // K+/-
+    kc=Lucomp(321); // K+/-
     fGPCode[kc][0]=11;
     fGPCode[kc][1]=12;
 
-    kc=LuComp(2112); // neutron/anti-neutron
+    kc=Lucomp(2112); // neutron/anti-neutron
     fGPCode[kc][0]=13;
     fGPCode[kc][1]=25;
     
-    kc=LuComp(2212); // proton/anti-proton
+    kc=Lucomp(2212); // proton/anti-proton
     fGPCode[kc][0]=14;
     fGPCode[kc][1]=15;
     
-    kc=LuComp(310);  // K0 short
+    kc=Lucomp(310);  // K0 short
     fGPCode[kc][0]=16; 
     fGPCode[kc][1]=16;
 
-    kc=LuComp(221);  // eta
+    kc=Lucomp(221);  // eta
     fGPCode[kc][0]=17;
     fGPCode[kc][1]=17;
 
-    kc=LuComp(3122); // lambda
+    kc=Lucomp(3122); // lambda
     fGPCode[kc][0]=18;
     fGPCode[kc][1]=18;
 
-    kc=LuComp(3222); // sigma+/antisigma+
+    kc=Lucomp(3222); // sigma+/antisigma+
     fGPCode[kc][0]=19;
     fGPCode[kc][1]=29;
 
-    kc=LuComp(3212); // sigma0/antisigma0
+    kc=Lucomp(3212); // sigma0/antisigma0
     fGPCode[kc][0]=20;
     fGPCode[kc][1]=28;
 
-    kc=LuComp(3112); // sigma-/antisigma-
+    kc=Lucomp(3112); // sigma-/antisigma-
     fGPCode[kc][0]=21;
     fGPCode[kc][1]=27;
 
-    kc=LuComp(3322); // xsi0-/antixsi0
+    kc=Lucomp(3322); // xsi0-/antixsi0
     fGPCode[kc][0]=22;
     fGPCode[kc][1]=30;
 
-    kc=LuComp(3312); // xsi-/antixsi+
+    kc=Lucomp(3312); // xsi-/antixsi+
     fGPCode[kc][0]=23;
     fGPCode[kc][1]=31;
 
-    kc=LuComp(3334); // omega/antiomega
+    kc=Lucomp(3334); // omega/antiomega
     fGPCode[kc][0]=24;
     fGPCode[kc][1]=32;
 }
@@ -549,13 +552,13 @@ void AliPythia::ForceDecay(Decay_t decay)
     
 Int_t  AliPythia::GetGeantCode(Int_t kf)
 {
-    Int_t kc=LuComp(TMath::Abs(kf));
+    Int_t kc=Lucomp(TMath::Abs(kf));
     return (kf > 0) ? fGPCode[kc][0] : fGPCode[kc][1];
 }
     
 Float_t  AliPythia::GetBraPart(Int_t kf)
 {
-    Int_t kc=LuComp(TMath::Abs(kf));
+    Int_t kc=Lucomp(TMath::Abs(kf));
     return fBraPart[kc];
 }
 

diff --git a/EVGEN/AliPythia.h b/EVGEN/AliPythia.h
index 90dbb69..9f5864d 100644 (file)
--- a/EVGEN/AliPythia.h
+++ b/EVGEN/AliPythia.h
@@ -25,7 +25,7 @@ class AliPythia:public TPythia
     // convert to compressed code and print result (for debugging only)
     virtual Int_t CheckedLuComp(Int_t kf)
        {
-           Int_t kc=LuComp(kf);
+           Int_t kc=Lucomp(kf);
            printf("\n Lucomp kf,kc %d %d",kf,kc);
            return kc;
        }

diff --git a/MUON/AliMUONdisplay.cxx b/MUON/AliMUONdisplay.cxx
index d8c19d6..632e8e4 100644 (file)
--- a/MUON/AliMUONdisplay.cxx
+++ b/MUON/AliMUONdisplay.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  1999/09/29 09:24:23  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 
@@ -44,7 +47,7 @@ $Log$
 #include <TSlider.h>
 #include <TSliderBox.h>
 #include <TGaxis.h>
-#include <TGXW.h>
+#include <TVirtualX.h>
 #include <TMath.h>
 #include <TMatrix.h>
 #include <X3DBuffer.h>
@@ -159,7 +162,7 @@ AliMUONdisplay::AliMUONdisplay(Int_t size)
    if (ysize < 100) ysize = 750;
    Int_t xsize = Int_t(size*830./ysize);
    fCanvas = new TCanvas("Canvas", "MUON Clusters Display",14,47,xsize,ysize);
-   fCanvas->SetEditable(kIsNotEditable);
+   fCanvas->SetEditable(kFALSE);
    fCanvas->ToggleEventStatus();
    
    // Create main display pad
@@ -675,7 +678,7 @@ void AliMUONdisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
    switch (event) {
 
    case kButton1Down:
-      gGXW->SetLineColor(-1);
+      gVirtualX->SetLineColor(-1);
       gPad->TAttLine::Modify();  //Change line attributes only if necessary
       x0 = gPad->AbsPixeltoX(px);
       y0 = gPad->AbsPixeltoY(py);
@@ -685,11 +688,11 @@ void AliMUONdisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
       return;
 
    case kButton1Motion:
-      if (linedrawn) gGXW->DrawBox(px0, py0, pxold, pyold, TGXW::kHollow);
+      if (linedrawn) gVirtualX->DrawBox(px0, py0, pxold, pyold, TVirtualX::kHollow);
       pxold = px;
       pyold = py;
       linedrawn = 1;
-      gGXW->DrawBox(px0, py0, pxold, pyold, TGXW::kHollow);
+      gVirtualX->DrawBox(px0, py0, pxold, pyold, TVirtualX::kHollow);
       return;
 
    case kButton1Up:

diff --git a/RICH/AliRICHdisplay.cxx b/RICH/AliRICHdisplay.cxx
index 6328291..01abc9e 100644 (file)
--- a/RICH/AliRICHdisplay.cxx
+++ b/RICH/AliRICHdisplay.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.5  1999/09/29 09:24:29  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 
@@ -45,7 +48,7 @@ $Log$
 #include <TSlider.h>
 #include <TSliderBox.h>
 #include <TGaxis.h>
-#include <TGXW.h>
+#include <TVirtualX.h>
 #include <TMath.h>
 #include <X3DBuffer.h>
 
@@ -152,7 +155,7 @@ AliRICHdisplay::AliRICHdisplay(Int_t size)
     if (ysize < 100) ysize = 750;
     Int_t xsize = Int_t(size*830./ysize);
     fCanvas = new TCanvas("Canvas", "RICH Clusters Display",14,47,xsize,ysize);
-    fCanvas->SetEditable(kIsNotEditable);
+    fCanvas->SetEditable(kFALSE);
     fCanvas->ToggleEventStatus();
     
     // Create main display pad
@@ -590,7 +593,7 @@ void AliRICHdisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
    switch (event) {
        
    case kButton1Down:
-       gGXW->SetLineColor(-1);
+       gVirtualX->SetLineColor(-1);
        gPad->TAttLine::Modify();  //Change line attributes only if necessary
        x0 = gPad->AbsPixeltoX(px);
        y0 = gPad->AbsPixeltoY(py);
@@ -600,11 +603,11 @@ void AliRICHdisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
        return;
        
    case kButton1Motion:
-       if (linedrawn) gGXW->DrawBox(px0, py0, pxold, pyold, TGXW::kHollow);
+       if (linedrawn) gVirtualX->DrawBox(px0, py0, pxold, pyold, TVirtualX::kHollow);
        pxold = px;
        pyold = py;
        linedrawn = 1;
-       gGXW->DrawBox(px0, py0, pxold, pyold, TGXW::kHollow);
+       gVirtualX->DrawBox(px0, py0, pxold, pyold, TVirtualX::kHollow);
        return;
        
    case kButton1Up:

diff --git a/STEER/AliDisplay.cxx b/STEER/AliDisplay.cxx
index 11749cf..cef75a4 100644 (file)
--- a/STEER/AliDisplay.cxx
+++ b/STEER/AliDisplay.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.5  1999/09/29 09:24:29  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 
@@ -43,7 +46,7 @@ $Log$
 #include <TSlider.h>
 #include <TSliderBox.h>
 #include <TGaxis.h>
-#include <TGXW.h>
+#include <TVirtualX.h>
 #include <TMath.h>
 #include <X3DBuffer.h>
 
@@ -161,7 +164,7 @@ AliDisplay::AliDisplay(Int_t size)
    if (ysize < 100) ysize = 750;
    Int_t xsize = Int_t(size*830./ysize);
    fCanvas = new TCanvas("Canvas", "ALICE Event Display",14,47,xsize,ysize);
-   fCanvas->SetEditable(kIsNotEditable);
+   fCanvas->SetEditable(kFALSE);
    fCanvas->ToggleEventStatus();
    
    // Create main display pad
@@ -657,7 +660,7 @@ void AliDisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
    switch (event) {
 
    case kButton1Down:
-      gGXW->SetLineColor(-1);
+      gVirtualX->SetLineColor(-1);
       gPad->TAttLine::Modify();  //Change line attributes only if necessary
       x0 = gPad->AbsPixeltoX(px);
       y0 = gPad->AbsPixeltoY(py);
@@ -667,11 +670,11 @@ void AliDisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
       return;
 
    case kButton1Motion:
-      if (linedrawn) gGXW->DrawBox(px0, py0, pxold, pyold, TGXW::kHollow);
+      if (linedrawn) gVirtualX->DrawBox(px0, py0, pxold, pyold, TVirtualX::kHollow);
       pxold = px;
       pyold = py;
       linedrawn = 1;
-      gGXW->DrawBox(px0, py0, pxold, pyold, TGXW::kHollow);
+      gVirtualX->DrawBox(px0, py0, pxold, pyold, TVirtualX::kHollow);
       return;
 
    case kButton1Up:

diff --git a/conf/GeneralDef b/conf/GeneralDef
index c2eb585..9d69f5d 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -49,17 +49,14 @@ BINDIR = $(ALICE_ROOT)/bin/tgt_$(ALICE_TARGET)
 
 # Current Version
 
-VERSION                = 3.02pre
+VERSION                = 3.02
  
 # Which 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
 
 # Alice libraries
 
@@ -67,12 +64,9 @@ ALILIBS            = -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
                 -lITS -lPHOSdummy -lPHOS -lCASTOR -lRICH -lZDC -lSTRUCT \
                 -lTGeant3 -lSTART -lCPV -lEVGEN -lSTEER
 
-# Graphic libraries
-
-ROOTGLIBS     = -lGpad -lGui -lGX11 -lX3d  -lXpm
- 
 # CERN Libraries 
 
 CLIBS         = -lminicern
 
 G3LIBS        = -lgeant321
+

diff --git a/conf/MachineDef.HP-UX b/conf/MachineDef.HP-UX
index 3dfb8ab..11ffa3e 100644 (file)
--- a/conf/MachineDef.HP-UX
+++ b/conf/MachineDef.HP-UX
@@ -35,6 +35,5 @@ LDFLAGS       = $(OPT) +a1 -z
 SHLD         = $(LD)
 SOFLAGS       = -b /usr/lib/libm.sl 
 
-LIBS          = $(ROOTLIBS) -lNew -lm
-GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/lib/X11R6 -L/usr/local/lib \
-                -lX11 -lm -ldld 
+LIBS          = $(ROOTLIBS)
+GLIBS         = $(ROOTLIBS) -L/usr/lib/X11R6 -lX11 

diff --git a/conf/MachineDef.HP-UX.aCC b/conf/MachineDef.HP-UX.aCC
index b4ef088..e171b59 100644 (file)
--- a/conf/MachineDef.HP-UX.aCC
+++ b/conf/MachineDef.HP-UX.aCC
@@ -35,6 +35,5 @@ LDFLAGS       = $(OPT) -z -Wl,+s -Wl,-E
 SHLD         = $(LD)
 SOFLAGS       = -b /usr/lib/libm.sl 
 
-LIBS          = $(ROOTLIBS) -lNew -lm
-GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/lib/X11R6 -L/usr/local/lib \
-                -lX11 -lm -ldld 
+LIBS          = $(ROOTLIBS)
+GLIBS         = $(ROOTLIBS) -L/usr/lib/X11R6 -lX11 

diff --git a/conf/MachineDef.Linux b/conf/MachineDef.Linux
index ff12ef6..0382156 100644 (file)
--- a/conf/MachineDef.Linux
+++ b/conf/MachineDef.Linux
@@ -46,6 +46,6 @@ SHLD        = $(LD)
 SOFLAGS       = -Wl,-soname,$(notdir $@) -shared 
 SHLIB         = -lg2c
 
-LIBS          = $(ROOTLIBS) -lm -ldl -rdynamic
-GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib -lX11 -lg2c -ldl -lcrypt -rdynamic
+LIBS          = $(ROOTLIBS) 
+GLIBS         = $(ROOTLIBS) -L/usr/X11R6/lib -lX11 -lg2c -lcrypt