fix link dependency, libProofx should NOT be linked with libXrdProofd

as it initializes some same symbols. git-svn-id: http://root.cern.ch/svn/root/trunk@18376 27541ba8-7e3a-0410-8455-c3a389f83636
wiene · Mar 20, 2007 · 971140d · 971140d
1 parent 23a56c7
commit 971140d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/config/Makefile.depend b/config/Makefile.depend
@@ -63,9 +63,8 @@ PROOFPLAYERLIBEXTRA = lib/libProof.lib lib/libNet.lib lib/libTree.lib \
                       lib/libGraf3d.lib lib/libGraf.lib lib/libGpad.lib \
                       lib/libRIO.lib lib/libHist.lib lib/libTreePlayer.lib \
                       lib/libThread.lib
-PROOFXLIBDEP        = $(NETLIB) $(PROOFLIB) $(THREADLIB) $(XPDLIB)
-PROOFXLIBEXTRA      = lib/libNet.lib lib/libProof.lib lib/libThread.lib \
-                      lib/libXrdProofd.lib
+PROOFXLIBDEP        = $(NETLIB) $(PROOFLIB) $(THREADLIB)
+PROOFXLIBEXTRA      = lib/libNet.lib lib/libProof.lib lib/libThread.lib
 SESSIONVIEWERLIBDEP   = $(PROOFLIB) $(GUILIB) $(GPADLIB) $(GRAFLIB) $(TREELIB)
 SESSIONVIEWERLIBEXTRA = lib/libProof.lib lib/libGui.lib lib/libGpad.lib \
                         lib/libGraf.lib lib/libTree.lib
@@ -222,8 +221,8 @@ PROOFPLAYERLIBDEP   = $(PROOFLIB) $(NETLIB) $(TREELIB) $(G3DLIB) $(GRAFLIB) \
                       $(IOLIB)
 PROOFPLAYERLIBEXTRA = -Llib -lProof -lNet -lTree -lGraf3d -lGraf -lGpad \
                       -lHist -lTreePlayer -lThread -lRIO
-PROOFXLIBDEP        = $(NETLIB) $(PROOFLIB) $(THREADLIB) $(XPDLIB)
-PROOFXLIBEXTRA      = -Llib -lNet -lProof -lThread -lXrdProofd
+PROOFXLIBDEP        = $(NETLIB) $(PROOFLIB) $(THREADLIB)
+PROOFXLIBEXTRA      = -Llib -lNet -lProof -lThread
 SESSIONVIEWERLIBDEP   = $(PROOFLIB) $(GUILIB) $(GPADLIB) $(GRAFLIB) $(TREELIB)
 SESSIONVIEWERLIBEXTRA = -Llib -lProof -lGui -lGpad -lGraf -lTree
 PEACLIBDEP          = $(PROOFLIB) $(CLARENSLIB)

diff --git a/proof/src/TProofServ.cxx b/proof/src/TProofServ.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name:  $:$Id: TProofServ.cxx,v 1.168 2007/03/19 14:43:26 rdm Exp $
+// @(#)root/proof:$Name:  $:$Id: TProofServ.cxx,v 1.169 2007/03/20 07:51:58 brun Exp $
 // Author: Fons Rademakers   16/02/97
 
 /*************************************************************************
@@ -3857,7 +3857,8 @@ Int_t TProofServ::HandleCache(TMessage *mess)
                // shortly after the master ones.
                TString cmd = Form("export ROOTINCLUDEPATH=%s ; PROOF-INF/BUILD.sh",
                                   gSystem->GetIncludePath());
-               { TProofServLogHandlerGuard hg(cmd, fSocket);
+               {
+                  TProofServLogHandlerGuard hg(cmd, fSocket);
                }
 
                // write version file

diff --git a/proofd/inc/XrdProofdTrace.h b/proofd/inc/XrdProofdTrace.h
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name:  $:$Id: XrdProofdTrace.h,v 1.7 2006/12/03 23:34:04 rdm Exp $
+// @(#)root/proofd:$Name:  $:$Id: XrdProofdTrace.h,v 1.8 2006/12/12 14:32:06 rdm Exp $
 // Author: G. Ganis  June 2005
 
 /*************************************************************************
@@ -39,8 +39,13 @@
 #ifndef ROOT_Riosfwd
 #include "Riosfwd.h"
 #endif
+#ifndef ROOT_DllImport
+#include "DllImport.h"
+#endif
 #include "XrdOuc/XrdOucTrace.hh"
 
+R__EXTERN XrdOucTrace *XrdProofdTrace;
+
 // Auxilliary macro
 #define TRACING(x) (XrdProofdTrace->What & TRACE_ ## x)
 #define TRACESET(act,on) \

diff --git a/proofd/src/XrdProofConn.cxx b/proofd/src/XrdProofConn.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name:  $:$Id: XrdProofConn.cxx,v 1.16 2007/01/22 11:36:41 rdm Exp $
+// @(#)root/proofd:$Name:  $:$Id: XrdProofConn.cxx,v 1.17 2007/03/19 15:14:10 rdm Exp $
 // Author: Gerardo Ganis  12/12/2005
 
 /*************************************************************************
@@ -58,7 +58,6 @@
 
 // Tracing utils
 #include "XrdProofdTrace.h"
-extern XrdOucTrace *XrdProofdTrace;
 static const char *TraceID = " ";
 #define TRACEID TraceID
 

diff --git a/proofd/src/XrdProofPhyConn.cxx b/proofd/src/XrdProofPhyConn.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name:  $:$Id: XrdProofPhyConn.cxx,v 1.10 2006/09/29 08:17:21 rdm Exp $
+// @(#)root/proofd:$Name:  $:$Id: XrdProofPhyConn.cxx,v 1.11 2006/10/19 12:38:07 rdm Exp $
 // Author: Gerardo Ganis  12/12/2005
 
 /*************************************************************************
@@ -39,7 +39,6 @@
 
 // Tracing utils
 #include "XrdProofdTrace.h"
-extern XrdOucTrace *XrdProofdTrace;
 static const char *gTraceID = " ";
 #define TRACEID gTraceID
 

diff --git a/proofd/src/XrdProofServProxy.cxx b/proofd/src/XrdProofServProxy.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name:  $:$Id: XrdProofServProxy.cxx,v 1.15 2007/02/05 10:44:33 rdm Exp $
+// @(#)root/proofd:$Name:  $:$Id: XrdProofServProxy.cxx,v 1.16 2007/03/19 15:14:10 rdm Exp $
 // Author: Gerardo Ganis  12/12/2005
 
 /*************************************************************************
@@ -23,7 +23,6 @@
 
 // Tracing utils
 #include "XrdProofdTrace.h"
-extern XrdOucTrace *XrdProofdTrace;
 static const char *TraceID = " ";
 #define TRACEID TraceID
 #ifndef SafeDelete
@@ -93,7 +92,7 @@ void XrdProofServProxy::ClearWorkers()
 {
    // Decrease worker counters and clean-up the list
 
-   XrdOucMutexHelper mhp(fMutex); 
+   XrdOucMutexHelper mhp(fMutex);
 
    // Decrease worker counters
    std::list<XrdProofWorker *>::iterator i;
@@ -139,7 +138,7 @@ XrdClientID *XrdProofServProxy::GetClientID(int cid)
    // Get instance corresponding to cid
    //
 
-   XrdOucMutexHelper mhp(fMutex); 
+   XrdOucMutexHelper mhp(fMutex);
 
    XrdClientID *csid = 0;
    TRACE(ACT,"XrdProofServProxy::GetClientID: cid: "<<cid<<
@@ -180,7 +179,7 @@ int XrdProofServProxy::GetFreeID()
    // Get next free client ID. If none is found, increase the vector size
    // and get the first new one
 
-   XrdOucMutexHelper mhp(fMutex); 
+   XrdOucMutexHelper mhp(fMutex);
 
    int ic = 0;
    // Search for free places in the existing vector
@@ -205,7 +204,7 @@ int XrdProofServProxy::GetNClients()
 {
    // Get number of attached clients.
 
-   XrdOucMutexHelper mhp(fMutex); 
+   XrdOucMutexHelper mhp(fMutex);
 
    int nc = 0;
    // Search for free places in the existing vector
@@ -225,7 +224,7 @@ const char *XrdProofServProxy::StatusAsString() const
 
    const char *sst[] = { "idle", "running", "shutting-down", "unknown" };
 
-   XrdOucMutexHelper mhp(fMutex); 
+   XrdOucMutexHelper mhp(fMutex);
 
    // Check status range
    int ist = fStatus;

diff --git a/proofd/src/XrdProofdResponse.cxx b/proofd/src/XrdProofdResponse.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name:  $:$Id: XrdProofdResponse.cxx,v 1.9 2006/11/20 15:56:36 rdm Exp $
+// @(#)root/proofd:$Name:  $:$Id: XrdProofdResponse.cxx,v 1.10 2006/12/03 23:34:04 rdm Exp $
 // Author: Gerardo Ganis  12/12/2005
 
 /*************************************************************************
@@ -29,7 +29,6 @@
 
 // Tracing utils
 #include "XrdProofdTrace.h"
-extern XrdOucTrace *XrdProofdTrace;
 const char *XrdProofdResponse::fgTraceID = " : Response";
 #define TRACEID fTraceID.c_str()
 #define TRSID ((const char *)fTrsid)