diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in root/net/xrootd/src/xrootd/config/GNUmake.env.in --- root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.env.in 2011-01-08 18:49:30.000000000 +0000 @@ -45,6 +45,7 @@ CFHASXRDCRYPTO = @hasxrdcrypto@ CFLAGS += $(CFSTRLCPY) $(CFHASOLDHDRS) $(CFFSTATAT) $(CFHASLIBZ) +CFLAGS += $(CXXFLAGS) # AFS relevant variables @incafs@ diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in root/net/xrootd/src/xrootd/config/GNUmake.options.in --- root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.options.in 2011-01-08 18:49:30.000000000 +0000 @@ -16,7 +16,7 @@ CF32="$(TYPECF32)" \ CFOP="$(@buildopt@)" \ LD="$(TYPELD)" \ -LDOP="$(@buildopt@)" \ +LDOP="$(LDFLAGS)" \ LDSO="$(TYPELDSO)" \ LIBS=" @ldsyslibs@ $(TYPELIBS)" \ TYPE="$(TYPE)" @@ -33,7 +33,7 @@ CF32="$(TYPECF32)" \ CFOP="$(@buildopt@)" \ LD="$(TYPELD)" \ -LDOP="$(@buildopt@)" \ +LDOP="$(LDFLAGS)" \ LDSO="$(TYPELDSO)" \ LIBS=" @ldsyslibs@ $(TYPELIBS)" \ TYPE="$(TYPE)" diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd --- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated $(CFTRACE) TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -TYPEOPT = $(TYPEMISC) -O2 +TYPEOPT = $(TYPEMISC) $(CXXFLAGS) TYPEDBG = $(TYPEMISC) -g TYPELDSO = -shared TYPESHLIB = so diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc --- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated -D__linux__ $(CFTRACE) TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -TYPEOPT = $(TYPEMISC) -O2 +TYPEOPT = $(TYPEMISC) $(CXXFLAGS) TYPEDBG = $(TYPEMISC) -g TYPELDSO = -shared TYPESHLIB = so diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 --- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated -D__linux__ $(CFTRACE) TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -TYPEOPT = $(TYPEMISC) -O2 +TYPEOPT = $(TYPEMISC) $(CXXFLAGS) TYPEDBG = $(TYPEMISC) -g TYPELDSO = -shared TYPESHLIB = so diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 --- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated -D__linux__ $(CFTRACE) TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -TYPEOPT = $(TYPEMISC) -O2 +TYPEOPT = $(TYPEMISC) $(CXXFLAGS) TYPEDBG = $(TYPEMISC) -g TYPELDSO = -m64 -shared TYPESHLIB = so diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc root/net/xrootd/src/xrootd/config/GNUmake.rules.icc --- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2011-01-08 18:49:30.000000000 +0000 @@ -13,7 +13,7 @@ -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE) TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -TYPEOPT = $(TYPEMISC) -O2 +TYPEOPT = $(TYPEMISC) $(CXXFLAGS) TYPEDBG = $(TYPEMISC) -g TYPELDSO = -m32 -shared TYPESHLIB = so diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 --- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2011-01-08 18:49:30.000000000 +0000 @@ -14,7 +14,7 @@ -wd1572 -wd584 -i-dynamic $(CFTRACE) TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -TYPEOPT = $(TYPEMISC) -O2 +TYPEOPT = $(TYPEMISC) $(CXXFLAGS) TYPEDBG = $(TYPEMISC) -g TYPELDSO = -m64 -shared TYPESHLIB = so diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos root/net/xrootd/src/xrootd/config/GNUmake.rules.macos --- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2011-01-08 18:49:30.000000000 +0000 @@ -18,7 +18,7 @@ TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 TYPELINK = -undefined dynamic_lookup -multiply_defined suppress -TYPEOPT = $(TYPEMISC) -O2 +TYPEOPT = $(TYPEMISC) $(CXXFLAGS) TYPEDBG = $(TYPEMISC) -g ifeq ($(subst $(MACOSX_MINOR),,1234),1234) TYPELDSO = $(TYPELINK) -dynamiclib -single_module -m32 diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 --- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2011-01-08 18:49:30.000000000 +0000 @@ -15,7 +15,7 @@ TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 TYPELINK = -undefined dynamic_lookup -multiply_defined suppress -TYPEOPT = $(TYPEMISC) -O2 +TYPEOPT = $(TYPEMISC) $(CXXFLAGS) TYPEDBG = $(TYPEMISC) -g ifeq ($(subst $(MACOSX_MINOR),,1234),1234) TYPELDSO = $(TYPELINK) -dynamiclib -single_module -m64 diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc --- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated -DSUNGCC $(CFTRACE) TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -TYPEOPT = $(TYPEMISC) -O2 +TYPEOPT = $(TYPEMISC) $(CXXFLAGS) TYPEDBG = $(TYPEMISC) -g TYPELDSO = -shared TYPESHLIB = so diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile --- root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -71,7 +71,7 @@ $(TESTBIN): $(OBJECTB) $(LIBDEPS) @echo Creating executable $(TESTBIN) - $(ECHO)$(LD) $(CFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) $(OBJDIR)/XrdAccAccess.o: XrdAccAccess.cc XrdAccAccess.hh \ XrdAccCapability.hh XrdAccConfig.hh XrdAccGroups.hh \ diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile --- root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -50,7 +50,7 @@ $(XRDADLER32): $(XRDADLER32_OBJ) $(XRDADLERDEPS) @echo Creating executable $(XRDADLER32) - $(ECHO)$(LD) $(LDOP) $(XRDADLER32_OBJ) $(XRDADLERLIBS) -o $(XRDADLER32) + $(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDADLER32_OBJ) $(XRDADLERLIBS) -o $(XRDADLER32) $(XRDADLER32_OBJ): Xrdadler32.cc \ XrdPosixExtern.hh XrdPosixXrootd.hh \ @@ -67,7 +67,7 @@ $(XRDMPXBIN): $(XRDMPXOBJ) @echo Creating executable $(XRDMPXBIN) - $(ECHO)$(LD) $(LDOP) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN) + $(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN) $(XRDMPXOBJ): XrdMpxStats.cc \ XrdNetDNS.hh XrdNetSocket.hh XrdNetOpts.hh \ @@ -83,7 +83,7 @@ $(XRDW41): $(XRDW41_OBJ) $(XRDW41_DEPS) @echo Creating executable $(XRDW41) - $(ECHO)$(LD) $(LDOP) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41) + $(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41) $(XRDW41_OBJ): XrdWait41.cc \ XrdOucTList.hh \ diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile --- root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -67,7 +67,7 @@ $(ECHO)ranlib $(LIBARCH) @echo Creating shared library $(LIBRARY) - $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) $(OBJDIR)/XrdBwm.o: XrdBwm.cc XrdBwm.hh \ XrdAccAuthorize.hh \ diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile --- root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2010-12-14 14:20:22.000000000 +0000 +++ root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -160,17 +160,17 @@ $(LIBSHARED): $(OBJECTS) $(LIBDEP) @echo Creating shared library $(LIBSHARED) $(ECHO)rm -f $(LIBSHARED) - $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED) + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED) ifneq ($(subst $(MACOSX_MINOR),,1234),1234) $(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \ - $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \ + $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \ fi endif $(LIBRARY_JNI): $(OBJECT_JNI) @echo Creating shared library $(LIBRARY_JNI) $(ECHO)rm -f $(LIBRARY_JNI); - $(ECHO)$(CC) $(CFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI) + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI) $(CLASS_JNI_TARGET): $(CLASS_JNI).java @echo Creating JNI class file $(CLASS_JNI_TARGET) @@ -178,27 +178,27 @@ $(BINDIR)/TestXrdClient_read: $(OBJECTS) $(OBJECTD) $(LIBDEPS) @echo Creating executable $(BINDIR)/TestXrdClient_read - $(ECHO)$(LD) $(LDOP) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read + $(ECHO)$(CC) $(LDFLAGS) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read $(BINDIR)/TestXrdClient: $(OBJECTS) $(OBJECTB) $(LIBDEPS) @echo Creating executable $(BINDIR)/TestXrdClient - $(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient + $(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient $(XRDCP): $(OBJECTS) $(OBJECTC) $(LIBDEPS) @echo Creating executable $(XRDCP) - $(ECHO)$(LD) $(LDOP) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP) + $(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP) $(XRDPREPTOOL): $(OBJECTS) $(OBJECT_PREPTOOL) $(LIBDEPS) @echo Creating executable $(XRDPREPTOOL) - $(ECHO)$(LD) $(LDOP) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL) + $(ECHO)$(CC) $(LDFLAGS) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL) $(XRDSTAGETOOL): $(OBJECTS) $(OBJECT_STAGETOOL) $(LIBDEPS) @echo Creating executable $(XRDSTAGETOOL) - $(ECHO)$(LD) $(LDOP) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL) + $(ECHO)$(CC) $(LDFLAGS) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL) $(XRDCLI): $(OBJECTS) $(OBJECT_CLI) $(LIBDEPS) @echo Creating executable $(XRDCLI) - $(ECHO)$(LD) $(LDOP) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI) + $(ECHO)$(CC) $(LDFLAGS) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI) $(XRDADMIN): $(PERLMOD) $(ECHO)if [ "$(PERLBIN)" != "" ]; then \ diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile --- root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -136,7 +136,7 @@ $(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS) @echo Creating executable $(BINARY) - $(ECHO)$(LD) $(LDOP) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) + $(ECHO)$(CC) $(LDFLAGS) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) $(LIBRARY): $(OBJCLNT) $(OBJBOTH) diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile --- root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -89,11 +89,11 @@ $(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP) @echo Creating executable $(BINDIR)/XrdCnsd - $(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd + $(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd $(TARGSSI): $(OBJSSI) $(OBJCOM) $(LIBDEP) @echo Creating executable $(BINDIR)/cns_ssi - $(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi + $(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi $(OBJDIR)/XrdCnsConfig.o: XrdCnsConfig.hh XrdCnsConfig.cc \ XrdCnsDaemon.hh XrdCnsLogRec.hh \ diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile --- root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -139,7 +139,7 @@ $(LIBRARY): $(OBJECTS) $(LIBUTIL) @echo Creating shared library $(LIBRARY) - $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY) + $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY) $(LIBASSL): $(OBJCSSL) @echo Creating archive $(LIBASSL) @@ -149,11 +149,11 @@ $(LIBCSSL): $(OBJCSSL) $(LIBARCH) $(LIBUTIL) @echo Creating shared library $(LIBCSSL) - $(ECHO)$(LD) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL) + $(ECHO)$(CC) $(LDFLAGS) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL) $(CRYPTOTEST): $(OBJECTA) $(LIBARCH) $(LIBDEPS) @echo Creating executable $(CRYPTOTEST) - $(ECHO)$(LD) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST) + $(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST) $(OBJDIR)/XrdCryptotest.o: XrdCryptotest.cc XrdSutAux.hh XProtocol.hh XrdSutBucket.hh \ XrdCryptoAux.hh XrdCryptoFactory.hh XrdCryptoCipher.hh \ diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile --- root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -133,15 +133,15 @@ $(BINADMIN): $(OBJLIB) $(OBJADMIN) $(OBJDEPS) @echo Creating executable $(BINADMIN) - $(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN) + $(ECHO)$(CC) $(LDFLAGS) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINADMIN) $(BINPURGD): $(OBJLIB) $(OBJPURG) $(OBJADDS) $(OBJDEPS) @echo Creating executable $(BINPURGD) - $(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD) + $(ECHO)$(CC) $(LDFLAGS) $(OBJPURG) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINPURGD) $(BINXFRD): $(OBJLIB) $(OBJXFR) $(OBJADDS) $(OBJDEPS) @echo Creating executables $(BINXFRD) - $(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD) + $(ECHO)$(CC) $(LDFLAGS) $(OBJXFR) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINXFRD) $(BINAGNT): $(BINXFRD) @echo Creating executables $(BINAGNT) diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile --- root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2010-12-14 14:20:23.000000000 +0000 +++ root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -141,45 +141,45 @@ $(ADMIN): $(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys $(COLLECTOR): $(OBJECTS_BIN_CTR) $(LIBRARY_CTR) \ $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys $(CONVTIME): $(OBJECTS_BIN_CTM) $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ $(COUT2FILE): $(OBJECTS_BIN_C2F) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ $(DEBUGPACKET): $(OBJECTS_BIN_DBP) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ $(DECODER): $(OBJECTS_BIN_DEC) $(LIBRARY_DEC) $(LIBRARY_OUC) \ $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ $(DUMPPACKETS): $(OBJECTS_BIN_DMP) $(LIBRARY_DEC) $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ $(FSENDER): $(OBJECTS_BIN_FSD) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ $(SENDER): $(OBJECTS_BIN_SND) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys $(TESTPARSER): $(OBJECTS_BIN_TPR) $(LIBRARY_COMMON) @echo Creating executable $(@F) - $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ + $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ $(OBJDIR)/%.o : %.cc @echo Compiling $(