diff -ur xrootd.orig/src/Xrd/Makefile.am xrootd/src/Xrd/Makefile.am
--- xrootd.orig/src/Xrd/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/Xrd/Makefile.am 2010-12-16 06:16:37.453934921 +0100
@@ -47,6 +47,11 @@
XrdScheduler.cc XrdScheduler.hh XrdJob.hh \
XrdStats.cc XrdStats.hh \
XrdTrace.hh
+libXrd_la_LIBADD = ../XrdNet/libXrdNet.la \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBPTHREAD)
## Extra sources that should go into the tarball
diff -ur xrootd.orig/src/XrdAcc/Makefile.am xrootd/src/XrdAcc/Makefile.am
--- xrootd.orig/src/XrdAcc/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdAcc/Makefile.am 2010-12-16 06:00:10.348934620 +0100
@@ -38,11 +38,11 @@
XrdAccCapability.cc XrdAccCapability.hh \
XrdAccConfig.cc XrdAccConfig.hh XrdAccAuthDB.hh \
XrdAccGroups.cc XrdAccGroups.hh XrdAccPrivs.hh
+libXrdAcc_la_LIBADD = ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBPTHREAD)
XrdAccTest_SOURCES = XrdAccTest.cc XrdAccAuthorize.hh
XrdAccTest_LDADD = libXrdAcc.la \
../XrdOuc/libXrdOuc.la \
- ../XrdNet/libXrdNet.la \
- ../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNetUtil.la \
- -ldl
+ ../XrdSys/libXrdSys.la
diff -ur xrootd.orig/src/XrdApps/Makefile.am xrootd/src/XrdApps/Makefile.am
--- xrootd.orig/src/XrdApps/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdApps/Makefile.am 2010-12-16 06:00:10.460935054 +0100
@@ -32,24 +32,23 @@
../XrdClient/libXrdClient.la \
../XrdPosix/libXrdPosix.la \
../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la
+ $(LIBZ)
-xrdadler32_LDFLAGS = -static -export-dynamic -ldl -lz
+xrdadler32_LDFLAGS = -static -export-dynamic
mpxstats_SOURCES = XrdMpxStats.cc
mpxstats_LDADD = \
../XrdNet/libXrdNet.la \
../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNetUtil.la
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la
mpxstats_LDFLAGS = -static -export-dynamic
wait41_SOURCES = XrdWait41.cc
wait41_LDADD = \
- ../XrdOuc/libXrdOuc.la \
../XrdSys/libXrdSys.la
wait41_LDFLAGS = -static -export-dynamic
diff -ur xrootd.orig/src/XrdBwm/Makefile.am xrootd/src/XrdBwm/Makefile.am
--- xrootd.orig/src/XrdBwm/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdBwm/Makefile.am 2010-12-16 06:00:10.461935045 +0100
@@ -37,4 +37,8 @@
libXrdBwm_la_LIBADD = ../XrdAcc/libXrdAcc.la \
../XrdNet/libXrdNet.la \
../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBPTHREAD)
+
+libXrdBwm_la_LDFLAGS = -module
diff -ur xrootd.orig/src/XrdClient/Makefile.am xrootd/src/XrdClient/Makefile.am
--- xrootd.orig/src/XrdClient/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdClient/Makefile.am 2010-12-16 06:49:09.726935000 +0100
@@ -77,22 +77,19 @@
XrdcpXtremeRead.cc XrdcpXtremeRead.hh
libXrdClient_la_LIBADD = $(LIBSUNMATH) \
- ../XrdSys/libXrdSys.la \
- ../XrdCrypto/libXrdCrypto.la \
- ../XrdSut/libXrdSut.la \
../XrdNet/libXrdNet.la \
../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNetUtil.la
+ $(LIBPTHREAD) -ldl
-clientlibs = libXrdClient.la \
- -ldl $(LIBZ)
+clientlibs = libXrdClient.la
xrdcp_SOURCES = Xrdcp.cc
# Note: static is required for Darwin. Linux and Solaris nicely manage to integrate
# all needed symbols with shared lib linking
xrdcp_LDFLAGS = -static -export-dynamic
-xrdcp_LDADD = $(clientlibs)
+xrdcp_LDADD = $(clientlibs) ../XrdCrypto/libXrdCrypto.la -ldl $(LIBZ)
@@ -114,13 +111,11 @@
xprep_SOURCES = XrdClientPrep.cc
xprep_LDADD = $(clientlibs)
-$(OBJECT_XPREP) $(BINLIBS) $(LIBM) $(LIBS)
xrdstagetool_SOURCES = XrdStageTool.cc
xrdstagetool_LDADD = $(clientlibs)
-$(OBJECT_STAGETOOL) $(BINLIBS) $(LIBM) $(LIBS)
if ENABLE_JAVAINT
libXrdClientAdminJNI_la_SOURCES = XrdClientAdminJNI.cc
diff -ur xrootd.orig/src/XrdCms/Makefile.am xrootd/src/XrdCms/Makefile.am
--- xrootd.orig/src/XrdCms/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdCms/Makefile.am 2010-12-16 06:26:19.292935186 +0100
@@ -61,9 +61,12 @@
libXrdCms_la_LIBADD = libXrdCmsConv.la \
- ../XrdNet/libXrdNet.la \
- ../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la
+ ../Xrd/libXrd.la \
+ ../XrdNet/libXrdNet.la \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBPTHREAD) -ldl
cmsd_SOURCES = \
XrdCmsAdmin.cc \
@@ -92,14 +95,13 @@
-cmsd_LDADD = libXrdCmsConv.la \
- ../XrdNet/libXrdNet.la \
+cmsd_LDADD = libXrdCms.la \
+ ../Xrd/libXrd.la \
../XrdOss/libXrdOss.la \
../XrdFrm/libXrdFrm.la \
+ ../XrdNet/libXrdNet.la \
../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la \
- ../Xrd/libXrd.la \
- -ldl
+ ../XrdSys/libXrdSys.la
cmsd_LDFLAGS = -static -export-dynamic
diff -ur xrootd.orig/src/XrdCns/Makefile.am xrootd/src/XrdCns/Makefile.am
--- xrootd.orig/src/XrdCns/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdCns/Makefile.am 2010-12-16 06:00:10.464935021 +0100
@@ -47,16 +47,15 @@
XrdCnsXref.cc
XrdCnsd_LDADD = \
- ../Xrd/libXrd.la \
../XrdOss/libXrdOss.la \
- ../XrdOuc/libXrdOuc.la \
+ ../XrdClient/libXrdClient.la \
../XrdNet/libXrdNet.la \
- ../XrdSys/libXrdSys.la \
- ../XrdClient/libXrdClient.la
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la
XrdCnsd_LDFLAGS = -static -export-dynamic
-$(OBJECT_XRDCNSD) $(BINLIBS) $(LIBM) $(LIBS)
cns_ssi_SOURCES = \
XrdCnsLog.cc \
@@ -67,13 +66,8 @@
XrdCnsSsiMain.cc
cns_ssi_LDADD = \
- ../Xrd/libXrd.la \
- ../XrdOss/libXrdOss.la \
../XrdOuc/libXrdOuc.la \
- ../XrdNet/libXrdNet.la \
- ../XrdSys/libXrdSys.la \
- ../XrdClient/libXrdClient.la
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la
cns_ssi_LDFLAGS = -static -export-dynamic
-
-$(OBJECT_CNS_SSI) $(BINLIBS) $(LIBM) $(LIBS)
diff -ur xrootd.orig/src/XrdCrypto/Makefile.am xrootd/src/XrdCrypto/Makefile.am
--- xrootd.orig/src/XrdCrypto/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdCrypto/Makefile.am 2010-12-16 06:00:10.465935016 +0100
@@ -43,11 +43,8 @@
XrdCryptosslX509.cc XrdCryptosslX509.hh \
XrdCryptosslX509Crl.cc XrdCryptosslX509Crl.hh \
XrdCryptosslX509Req.cc XrdCryptosslX509Req.hh \
- XrdCryptosslFactory.cc XrdCryptosslFactory.hh \
XrdCryptosslgsiAux.cc XrdCryptosslgsiAux.hh \
XrdCryptosslgsiX509Chain.cc XrdCryptosslgsiX509Chain.hh
-libXrdSSLutil_la_LIBADD = ../XrdSut/libXrdSut.la \
- $(OPENSSL_LIBDIR) -lssl -lcrypto
libXrdSSLutil_la_CXXFLAGS = $(SSLCXXFLAGS)
libXrdCrypto_la_SOURCES = \
@@ -65,33 +62,24 @@
XrdCryptoX509Req.cc XrdCryptoX509Req.hh \
XrdCryptolocalCipher.cc XrdCryptolocalCipher.hh \
XrdCryptolocalFactory.cc XrdCryptolocalFactory.hh
-libXrdCrypto_la_LIBADD = libXrdSSLutil.la \
+libXrdCrypto_la_LIBADD = ../XrdSut/libXrdSut.la \
../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNet.la \
- ../XrdNet/libXrdNetUtil.la
-libXrdCrypto_la_LDFLAGS = -module
+ ../XrdSys/libXrdSys.la -ldl
libXrdCryptoLite_la_SOURCES = \
XrdCryptoLite.hh \
XrdCryptoLite.cc \
XrdCryptoLite_bf32.cc
-libXrdCryptoLite_la_LDFLAGS = -module
libXrdCryptoLite_la_CXXFLAGS = $(SSLCXXFLAGS)
-libXrdCryptoLite_la_LIBADD = $(OPENSSL_LIBDIR) -lcrypto
+libXrdCryptoLite_la_LIBADD = ../XrdOuc/libXrdOuc.la \
+ $(OPENSSL_LIBDIR) -lcrypto
-libXrdCryptossl_la_SOURCES = \
- XrdCryptosslAux.cc \
- XrdCryptosslCipher.cc \
- XrdCryptosslFactory.cc \
- XrdCryptosslMsgDigest.cc \
- XrdCryptosslRSA.cc \
- XrdCryptosslX509.cc \
- XrdCryptosslX509Crl.cc \
- XrdCryptosslX509Req.cc \
- XrdCryptosslgsiAux.cc \
- XrdCryptosslgsiX509Chain.cc
-libXrdCryptossl_la_LIBADD = ../XrdSut/libXrdSut.la \
+libXrdCryptossl_la_SOURCES = XrdCryptosslFactory.cc XrdCryptosslFactory.hh
+libXrdCryptossl_la_LIBADD = libXrdSSLutil.la \
+ libXrdCrypto.la \
+ ../XrdSut/libXrdSut.la \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la \
$(OPENSSL_LIBDIR) -lssl -lcrypto
libXrdCryptossl_la_LDFLAGS = -module
libXrdCryptossl_la_CXXFLAGS = $(SSLCXXFLAGS)
diff -ur xrootd.orig/src/XrdFfs/Makefile.am xrootd/src/XrdFfs/Makefile.am
--- xrootd.orig/src/XrdFfs/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdFfs/Makefile.am 2010-12-16 07:15:28.437933903 +0100
@@ -42,15 +42,12 @@
XrdFfsQueue.cc \
XrdFfsWcache.cc
-libXrdFfs_la_LIBADD = ../XrdPosix/libXrdPosix.la \
+libXrdFfs_la_LIBADD = ../XrdSecsss/libXrdSecsssUtil.la \
+ ../XrdPosix/libXrdPosix.la \
../XrdClient/libXrdClient.la \
- ../XrdSec/libXrdSec.la \
- ../XrdSecsss/libXrdSecsss.la \
- ../XrdNet/libXrdNet.la \
- ../XrdNet/libXrdNetUtil.la \
../XrdOuc/libXrdOuc.la \
../XrdSys/libXrdSys.la \
- $(FUSELIB)
+ $(LIBPTHREAD)
xrootdfs_SOURCES = XrdFfsXrootdfs.cc
-xrootdfs_LDADD = libXrdFfs.la
+xrootdfs_LDADD = libXrdFfs.la $(FUSELIB)
diff -ur xrootd.orig/src/XrdMon/Makefile.am xrootd/src/XrdMon/Makefile.am
--- xrootd.orig/src/XrdMon/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdMon/Makefile.am 2010-12-16 06:00:10.467935006 +0100
@@ -10,7 +10,7 @@
# global settings
AM_CPPFLAGS = -I$(top_srcdir)/src
-AM_LDFLAGS=-static
+AM_LDFLAGS = -static
#############################################################################
## extra directory definitions for install tree
@@ -105,14 +105,11 @@
xrdmonCollector_LDADD = libXrdMonCollector.la \
libXrdMonDecoder.la \
libXrdMonCommon.la \
- ../XrdOuc/libXrdOuc.la \
../XrdSys/libXrdSys.la
xrdmonDecoder_SOURCES = XrdMonDecMainApp.cc
xrdmonDecoder_LDADD = libXrdMonDecoder.la \
- libXrdMonCommon.la \
- ../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la
+ libXrdMonCommon.la
xrdmonDummySender_SOURCES = XrdMonSndDummyXrootdApp.cc
xrdmonDummySender_LDADD = libXrdMonDummySender.la \
@@ -140,5 +137,4 @@
xrdmonCout2file_SOURCES = XrdMonCout2FileApp.cc
xrdmonCout2file_LDADD = libXrdMonDecoder.la \
- ../XrdOuc/libXrdOuc.la \
- libXrdMonCommon.la
\ No newline at end of file
+ libXrdMonCommon.la
diff -ur xrootd.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd/src/XrdMon/XrdMonArgParserConvert.hh
--- xrootd.orig/src/XrdMon/XrdMonArgParserConvert.hh 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdMon/XrdMonArgParserConvert.hh 2010-12-16 06:00:10.469935000 +0100
@@ -12,6 +12,7 @@
#include "XrdMon/XrdMonException.hh"
#include "XrdMon/XrdMonErrors.hh"
+#include <stdio.h>
#include <stdlib.h> /* atoi */
#include <string.h>
diff -ur xrootd.orig/src/XrdOfs/Makefile.am xrootd/src/XrdOfs/Makefile.am
--- xrootd.orig/src/XrdOfs/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdOfs/Makefile.am 2010-12-16 06:35:41.344934862 +0100
@@ -18,11 +18,7 @@
XrdOfs.hh \
XrdOfsEvr.hh XrdOfsEvs.hh XrdOfsHandle.hh \
XrdOfsSecurity.hh XrdOfsTrace.hh XrdOfsConfig.hh \
- XrdOfsConfig.cc XrdOfsEvs.cc XrdOfsEvr.cc XrdOfsHandle.cc XrdOfs.cc \
XrdOfsPoscq.hh XrdOfsStats.hh
-# Note: the source files above also get installed in the headers directory,
-# so that derived objects of the Ofs can be built. This was originally
-# needed for the ALICE tokenauthz extension.
libXrdOfs_la_SOURCES = \
XrdOfs.cc XrdOfs.hh XrdOfsSecurity.hh XrdOfsTrace.hh XrdOfsFS.cc \
@@ -32,7 +28,11 @@
XrdOfsHandle.cc XrdOfsHandle.hh \
XrdOfsPoscq.cc XrdOfsStats.cc
-libXrdOfs_la_LIBTOOLFLAGS = --tag=disable-static
-libXrdOfs_la_LDFLAGS =
-
-libXrdOfs_la_LIBADD =
+libXrdOfs_la_LIBADD = ../XrdCms/libXrdCms.la \
+ ../XrdOss/libXrdOss.la \
+ ../XrdAcc/libXrdAcc.la \
+ ../XrdNet/libXrdNet.la \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBPTHREAD)
diff -ur xrootd.orig/src/XrdOss/Makefile.am xrootd/src/XrdOss/Makefile.am
--- xrootd.orig/src/XrdOss/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdOss/Makefile.am 2010-12-16 06:00:10.470935000 +0100
@@ -41,4 +41,7 @@
XrdOssSpace.cc XrdOssSpace.hh \
XrdOssStat.cc \
XrdOssUnlink.cc
-libXrdOss_la_LIBADD = $(LIBRT)
+libXrdOss_la_LIBADD = ../XrdFrm/libXrdFrm.la \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBRT) $(LIBPTHREAD)
diff -ur xrootd.orig/src/XrdOuc/Makefile.am xrootd/src/XrdOuc/Makefile.am
--- xrootd.orig/src/XrdOuc/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdOuc/Makefile.am 2010-12-16 06:00:10.470935000 +0100
@@ -57,18 +57,10 @@
XrdOucTrace.cc XrdOucTrace.hh \
XrdOucUtils.cc XrdOucUtils.hh
-# XrdOucCRC.cc XrdOucCRC.hh \
-# XrdOucHash.icc
+libXrdOuc_la_LIBADD = ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL)
-libXrdOuc_la_LIBADD = $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL) ../XrdSys/libXrdSysErrLog.la
-
-# sources not named in rules that still need to get rolled into the distribution tarball
-EXTRA_DIST = XrdOucRash.hh XrdOucRash.icc
-
-
-# TODO: (DEREK) why are these compiled in the classic GNUmakefile instead of making a lib?
-# XrdSys/XrdSysError.cc XrdSys/XrdSysError.hh \
-# XrdSys/XrdSysLogger.cc
# TODO: again as in classic? REFAC libXrdOuc_la_CXXFLAGS = -prefer-pic
# TODO: again as in classic? REFAC libXrdOuc_la_LDFLAGS = -static
diff -ur xrootd.orig/src/XrdPosix/Makefile.am xrootd/src/XrdPosix/Makefile.am
--- xrootd.orig/src/XrdPosix/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdPosix/Makefile.am 2010-12-16 07:08:35.222934713 +0100
@@ -41,10 +41,9 @@
XrdPosixXrootd.cc
libXrdPosix_la_LIBADD = ../XrdClient/libXrdClient.la \
- ../XrdSec/libXrdSec.la \
- ../XrdNet/libXrdNet.la \
../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la
+ ../XrdSys/libXrdSys.la \
+ $(LIBPTHREAD) -ldl
#libXrdPosixPreload_la_SOURCES = \
# XrdPosixPreload32.cc \
@@ -57,6 +56,5 @@
# ../XrdClient/libXrdClient.la \
# ../XrdNet/libXrdNet.la \
# ../XrdOuc/libXrdOuc.la \
-# ../XrdSec/libXrdSec.la \
# ../XrdSys/libXrdSys.la
diff -ur xrootd.orig/src/XrdPss/Makefile.am xrootd/src/XrdPss/Makefile.am
--- xrootd.orig/src/XrdPss/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdPss/Makefile.am 2010-12-16 06:00:10.471935001 +0100
@@ -21,10 +21,9 @@
XrdPssConfig.cc
libXrdPss_la_LIBADD = ../XrdFfs/libXrdFfs.la \
- ../XrdClient/libXrdClient.la \
- ../XrdSecsss//libXrdSecsss.la \
- ../XrdSec//libXrdSec.la \
- ../XrdNet/libXrdNet.la \
- ../XrdNet/libXrdNetUtil.la \
+ ../XrdPosix/libXrdPosix.la \
../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
../XrdSys/libXrdSys.la
+
+libXrdPss_la_LDFLAGS = -module
diff -ur xrootd.orig/src/XrdRootd/Makefile.am xrootd/src/XrdRootd/Makefile.am
--- xrootd.orig/src/XrdRootd/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdRootd/Makefile.am 2010-12-16 06:00:10.472935002 +0100
@@ -13,4 +13,5 @@
INCLUDES = -I$(top_srcdir)/src
libXrdRootd_la_SOURCES = XrdRootdProtocol.cc XrdRootdProtocol.hh
-libXrdRootd_la_LIBADD = ../XrdOuc/libXrdOuc.la
+libXrdRootd_la_LIBADD = ../Xrd/libXrd.la ../XrdSys/libXrdSys.la
+libXrdRootd_la_LDFLAGS = -module
diff -ur xrootd.orig/src/XrdSec/Makefile.am xrootd/src/XrdSec/Makefile.am
--- xrootd.orig/src/XrdSec/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSec/Makefile.am 2010-12-16 06:00:10.473935003 +0100
@@ -16,47 +16,42 @@
#############################################################################
## deliverables (to be built / installed)
-xrootdsecinc_HEADERS = XrdSecInterface.hh XrdSecEntity.hh XrdSecTLayer.hh
+xrootdsecinc_HEADERS = XrdSecInterface.hh XrdSecEntity.hh
lib_LTLIBRARIES = libXrdSec.la
+noinst_LTLIBRARIES = libXrdSecUtil.la libXrdSecTLayer.la
+
bin_PROGRAMS = testclient testserver
#############################################################################
# Build rules
-libXrdSec_la_SOURCES = \
+libXrdSecUtil_la_SOURCES = \
XrdSecClient.cc XrdSecInterface.hh XrdSecEntity.hh \
XrdSecPManager.cc XrdSecPManager.hh \
XrdSecProtocolhost.cc XrdSecProtocolhost.hh \
XrdSecServer.cc XrdSecServer.hh \
- XrdSecTLayer.cc XrdSecTLayer.hh \
XrdSecTrace.hh
+
+libXrdSec_la_SOURCES =
+nodist_EXTRA_libXrdSec_la_SOURCES = dummy.cpp
libXrdSec_la_LDFLAGS = -module
+libXrdSec_la_LIBTOOLFLAGS = --tag=disable-static
+libXrdSec_la_LIBADD = libXrdSecUtil.la \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la -ldl
-# Note: the next option leads to problems at least on Darwin
-#libXrdSec_la_LIBTOOLFLAGS = --tag=disable-static
-# loadable modules are not equal to shared libraries, even though
-# this holds true for many systems
-# So, the testclient linking is actually not portable. Libtool can go
-# around this problem, if a static library for libXrdSec is available.
-# The clean way would be to either build a module and a library, or
-# make the testclient load the loadable module.
+libXrdSecTLayer_la_SOURCES = XrdSecTLayer.cc XrdSecTLayer.hh
testclient_SOURCES = XrdSectestClient.cc
testclient_LDFLAGS = -static
-testclient_LDADD = libXrdSec.la \
- -ldl \
- ../XrdOuc/libXrdOuc.la \
- ../XrdNet/libXrdNet.la \
- ../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNetUtil.la
+testclient_LDADD = libXrdSecUtil.la \
+ ../XrdSys/libXrdSys.la
testserver_SOURCES = XrdSectestServer.cc
testserver_LDFLAGS = -static
-testserver_LDADD = libXrdSec.la \
- -ldl \
+testserver_LDADD = libXrdSecUtil.la \
../XrdOuc/libXrdOuc.la \
- ../XrdNet/libXrdNet.la \
- ../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNetUtil.la
+ ../XrdSys/libXrdSys.la
diff -ur xrootd.orig/src/XrdSecgsi/Makefile.am xrootd/src/XrdSecgsi/Makefile.am
--- xrootd.orig/src/XrdSecgsi/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSecgsi/Makefile.am 2010-12-16 06:00:10.473935003 +0100
@@ -12,8 +12,7 @@
bin_PROGRAMS = xrdgsiproxy
-# TODO: xrdsecgsitest no longer builds
-#check_PROGRAMS = xrdsecgsitest
+check_PROGRAMS = xrdsecgsitest
INCLUDES = -I$(top_srcdir)/src
@@ -21,14 +20,15 @@
XrdSecProtocolgsi.cc XrdSecProtocolgsi.hh XrdSecgsiTrace.hh
libXrdSecgsi_la_LDFLAGS = -module
-libXrdSecgsi_la_LIBADD = ../XrdCrypto/libXrdCryptossl.la \
+libXrdSecgsi_la_LIBADD = ../XrdCrypto/libXrdSSLutil.la \
../XrdCrypto/libXrdCrypto.la \
- ../XrdSec/libXrdSec.la \
- ../XrdOuc/libXrdOuc.la \
+ ../XrdSut/libXrdSut.la \
../XrdNet/libXrdNet.la \
- ../XrdSys/libXrdSys.la
-# following line disabled. Look for reason in XrdSec/Makefile.am
-#libXrdSecgsi_la_LIBTOOLFLAGS = --tag=disable-static
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
+ $(OPENSSL_LIBDIR) -lssl -lcrypto
+libXrdSecgsi_la_LIBTOOLFLAGS = --tag=disable-static
# GridMAP function looking up an LDAP database
libXrdSecgsiGMAPLADP_la_SOURCES = XrdSecgsiGMAPFunLDAP.cc
@@ -36,16 +36,15 @@
xrdgsiproxy_SOURCES = XrdSecgsiProxy.cc
xrdgsiproxy_LDFLAGS = -static
-xrdgsiproxy_LDADD = libXrdSecgsi.la \
- ../XrdSec/libXrdSec.la \
- ../XrdOuc/libXrdOuc.la \
+xrdgsiproxy_LDADD = ../XrdCrypto/libXrdSSLutil.la \
+ ../XrdCrypto/libXrdCrypto.la \
../XrdNet/libXrdNet.la \
- ../XrdSys/libXrdSys.la
-
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la \
+ $(OPENSSL_LIBDIR) -lssl -lcrypto
-#xrdsecgsitest_SOURCES = XrdSecgsitest.cc
-#xrdsecgsitest_LDADD = libXrdSecgsi.la \
-# ../XrdSec/libXrdSec.la \
-# ../XrdOuc/libXrdOuc.la \
-# ../XrdNet/libXrdNet.la
+xrdsecgsitest_SOURCES = XrdSecgsitest.cc
+xrdsecgsitest_LDADD = ../XrdCrypto/libXrdSSLutil.la \
+ ../XrdCrypto/libXrdCrypto.la \
+ $(OPENSSL_LIBDIR) -lssl -lcrypto
diff -ur xrootd.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd/src/XrdSecgsi/XrdSecProtocolgsi.cc
--- xrootd.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSecgsi/XrdSecProtocolgsi.cc 2010-12-16 06:00:10.475935003 +0100
@@ -150,6 +150,7 @@
XrdOucTrace *XrdSecProtocolgsi::GSITrace = 0;
XrdOucTrace *gsiTrace = 0;
+XrdOucTrace *sslTrace = 0;
/******************************************************************************/
/* S t a t i c F u n c t i o n s */
diff -ur xrootd.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd/src/XrdSecgsi/XrdSecgsiProxy.cc
--- xrootd.orig/src/XrdSecgsi/XrdSecgsiProxy.cc 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSecgsi/XrdSecgsiProxy.cc 2010-12-16 06:00:10.477935003 +0100
@@ -94,6 +94,7 @@
static XrdSysLogger Logger;
static XrdSysError eDest(0,"proxy_");
XrdOucTrace *gsiTrace = 0;
+XrdOucTrace *sslTrace = 0;
int main( int argc, char **argv )
{
diff -ur xrootd.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd/src/XrdSecgsi/XrdSecgsitest.cc
--- xrootd.orig/src/XrdSecgsi/XrdSecgsitest.cc 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSecgsi/XrdSecgsitest.cc 2010-12-16 06:00:10.478935003 +0100
@@ -52,6 +52,7 @@
static XrdSysLogger Logger;
static XrdSysError eDest(0,"gsitest_");
XrdOucTrace *gsiTrace = 0;
+XrdOucTrace *sslTrace = 0;
int main( int argc, char **argv )
{
diff -ur xrootd.orig/src/XrdSeckrb4/Makefile.am xrootd/src/XrdSeckrb4/Makefile.am
--- xrootd.orig/src/XrdSeckrb4/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSeckrb4/Makefile.am 2010-12-16 06:00:10.478935003 +0100
@@ -13,6 +13,9 @@
INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR)
libXrdSeckrb4_la_SOURCES = XrdSecProtocolkrb4.cc
-libXrdSeckrb4_la_LIBADD = $(KRB5_LIBDIR) -lkrb4 -lkrb5 -ldes425 -lk5crypto -lcom_err
+libXrdSeckrb4_la_LIBADD = \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la \
+ $(KRB5_LIBDIR) -lkrb4 -lkrb5 -ldes425 -lk5crypto -lcom_err
libXrdSeckrb4_la_LDFLAGS = -module
-libXrdSeckrb4_la_LIBTOOLFLAGS = --tag=disable-static
\ No newline at end of file
+libXrdSeckrb4_la_LIBTOOLFLAGS = --tag=disable-static
diff -ur xrootd.orig/src/XrdSeckrb5/Makefile.am xrootd/src/XrdSeckrb5/Makefile.am
--- xrootd.orig/src/XrdSeckrb5/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSeckrb5/Makefile.am 2010-12-16 06:00:10.478935003 +0100
@@ -22,9 +22,9 @@
libXrdSeckrb5_la_SOURCES = XrdSecProtocolkrb5.cc
libXrdSeckrb5_la_LIBADD = \
- ../XrdSys/libXrdSys.la \
../XrdOuc/libXrdOuc.la \
- ../XrdNet/libXrdNet.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
$(KRB5_LIBDIR) -lkrb5 -lk5crypto -lcom_err
libXrdSeckrb5_la_LDFLAGS = -module
diff -ur xrootd.orig/src/XrdSecpwd/Makefile.am xrootd/src/XrdSecpwd/Makefile.am
--- xrootd.orig/src/XrdSecpwd/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSecpwd/Makefile.am 2010-12-16 06:00:10.479935003 +0100
@@ -20,7 +20,7 @@
../XrdSut/libXrdSut.la \
../XrdOuc/libXrdOuc.la \
../XrdSys/libXrdSys.la \
- $(CRYPTLIB) $(OPENSSL_LIBDIR) -ldl -lcrypto
+ $(CRYPTLIB)
libXrdSecpwd_la_LDFLAGS = -module
libXrdSecpwd_la_LIBTOOLFLAGS = --tag=disable-static
@@ -28,7 +28,5 @@
xrdpwdadmin_LDFLAGS = -static
xrdpwdadmin_LDADD = ../XrdCrypto/libXrdCrypto.la \
../XrdSut/libXrdSut.la \
- ../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la \
- $(CRYPTLIB) $(OPENSSL_LIBDIR) -ldl -lcrypto
+ ../XrdOuc/libXrdOuc.la
diff -ur xrootd.orig/src/XrdSecsss/Makefile.am xrootd/src/XrdSecsss/Makefile.am
--- xrootd.orig/src/XrdSecsss/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSecsss/Makefile.am 2010-12-16 06:00:10.479935003 +0100
@@ -19,34 +19,29 @@
## deliverables (to be built / installed)
lib_LTLIBRARIES = libXrdSecsss.la
+noinst_LTLIBRARIES = libXrdSecsssUtil.la
+
bin_PROGRAMS = xrdsssadmin
Secsssinc_HEADERS = XrdSecProtocolsss.hh XrdSecsssID.hh XrdSecsssKT.hh XrdSecsssRR.hh
#############################################################################
## Build rules
-libXrdSecsss_la_SOURCES = \
- XrdSecProtocolsss.cc \
+libXrdSecsssUtil_la_SOURCES = \
XrdSecsssID.cc \
XrdSecsssKT.cc
-libXrdSecsss_la_LIBADD = ../XrdCrypto/libXrdCryptoLite.la \
- ../XrdOuc/libXrdOuc.la \
- ../XrdNet/libXrdNet.la \
- ../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNetUtil.la
+libXrdSecsss_la_SOURCES = XrdSecProtocolsss.cc
+libXrdSecsss_la_LIBADD = libXrdSecsssUtil.la \
+ ../XrdCrypto/libXrdCryptoLite.la \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la
-libXrdSecsss_la_LDFLAGS = -module $(CRYPTLIB) $(OPENSSL_LIBDIR)
+libXrdSecsss_la_LDFLAGS = -module
xrdsssadmin_SOURCES = XrdSecsssAdmin.cc
xrdsssadmin_LDFLAGS = -static
-xrdsssadmin_LDADD = libXrdSecsss.la
-
-# ../XrdCrypto/libXrdCryptoLite.la \
-# ../XrdOuc/libXrdOuc.la \
-# ../XrdNet/libXrdNet.la \
-# ../XrdSys/libXrdSys.la \
-# ../XrdNet/libXrdNetUtil.la \
-# $(CRYPTLIB) $(OPENSSL_LIBDIR) -lcrypto
-
-
+xrdsssadmin_LDADD = libXrdSecsssUtil.la \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la
diff -ur xrootd.orig/src/XrdSecunix/Makefile.am xrootd/src/XrdSecunix/Makefile.am
--- xrootd.orig/src/XrdSecunix/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSecunix/Makefile.am 2010-12-16 06:00:10.480935003 +0100
@@ -13,9 +13,7 @@
INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR)
libXrdSecunix_la_SOURCES = XrdSecProtocolunix.cc
-libXrdSecunix_la_LIBADD = ../XrdSec/libXrdSec.la \
- ../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la
+libXrdSecunix_la_LIBADD = ../XrdSys/libXrdSys.la
libXrdSecunix_la_LDFLAGS = -module
libXrdSecunix_la_LIBTOOLFLAGS = --tag=disable-static
diff -ur xrootd.orig/src/XrdSut/Makefile.am xrootd/src/XrdSut/Makefile.am
--- xrootd.orig/src/XrdSut/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSut/Makefile.am 2010-12-16 06:00:10.480935003 +0100
@@ -27,3 +27,6 @@
XrdSutPFile.cc XrdSutPFile.hh\
XrdSutPFEntry.cc XrdSutPFEntry.hh \
XrdSutRndm.cc XrdSutRndm.hh
+
+libXrdSut_la_LIBADD = ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la
diff -ur xrootd.orig/src/XrdSys/Makefile.am xrootd/src/XrdSys/Makefile.am
--- xrootd.orig/src/XrdSys/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdSys/Makefile.am 2010-12-16 06:00:10.481935003 +0100
@@ -20,9 +20,6 @@
lib_LTLIBRARIES = libXrdSys.la
-# convenience lib since these files are also used for builds in other dirs
-noinst_LTLIBRARIES = libXrdSysErrLog.la
-
xrootdsysinc_HEADERS = \
XrdSysDir.hh XrdSysLogger.hh XrdSysPlugin.hh \
XrdSysPthread.hh XrdSysTimer.hh XrdWin32.hh \
@@ -33,12 +30,10 @@
#############################################################################
# Build rules
-libXrdSysErrLog_la_SOURCES = \
- XrdSysError.cc XrdSysError.hh \
- XrdSysLogger.cc XrdSysLogger.hh
-
libXrdSys_la_SOURCES = \
XrdSysDir.cc XrdSysDir.hh \
+ XrdSysError.cc XrdSysError.hh \
+ XrdSysLogger.cc XrdSysLogger.hh \
XrdSysPlugin.cc XrdSysPlugin.hh \
XrdSysPriv.cc XrdSysPriv.hh \
XrdSysPlatform.cc \
@@ -47,7 +42,7 @@
XrdSysTimer.cc XrdSysTimer.hh \
XrdSysXSLock.cc XrdSysXSLock.hh
-libXrdSys_la_LIBADD = $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL) libXrdSysErrLog.la
+libXrdSys_la_LIBADD = -ldl $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL)
libXrdSys_la_CXXFLAGS = -prefer-pic
# sources not named in rules that still need to get rolled into the distribution tarball
diff -ur xrootd.orig/src/XrdXrootd/Makefile.am xrootd/src/XrdXrootd/Makefile.am
--- xrootd.orig/src/XrdXrootd/Makefile.am 2010-12-09 16:24:21.000000000 +0100
+++ xrootd/src/XrdXrootd/Makefile.am 2010-12-16 06:00:10.481935003 +0100
@@ -39,21 +39,10 @@
xrootd_LDADD = -ldl \
../Xrd/libXrd.la \
../XrdOfs/libXrdOfs.la \
- ../XrdAcc/libXrdAcc.la \
- ../XrdOss/libXrdOss.la \
- ../XrdFrm/libXrdFrm.la \
../XrdCms/libXrdCms.la \
../XrdNet/libXrdNet.la \
- ../XrdNet/libXrdNetUtil.la \
../XrdOuc/libXrdOuc.la \
+ ../XrdNetUtil/libXrdNetUtil.la \
../XrdSys/libXrdSys.la
xrootd_LDFLAGS = -static -export-dynamic
-
-#if IS_GCC
-#xrootd_CXXFLAGS = -fPIC
-# the program should export its symbol table so that a module's
-# unresolved functions can be satisfied by it:
-# -export-dynamic
-#xrootd_LDFLAGS += -static -export-dynamic -fPIC
-#endif