Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 298284 | Differences between
and this patch

Collapse All | Expand All

(-)root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd (-1 / +1 lines)
Lines 11-17 Link Here
11
             -Wall -Wno-deprecated $(CFTRACE)
11
             -Wall -Wno-deprecated $(CFTRACE)
12
TYPECF32   =
12
TYPECF32   =
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
14
TYPEOPT    = $(TYPEMISC) -O2
14
TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
15
TYPEDBG    = $(TYPEMISC) -g
15
TYPEDBG    = $(TYPEMISC) -g
16
TYPELDSO   = -shared
16
TYPELDSO   = -shared
17
TYPESHLIB  = so
17
TYPESHLIB  = so
(-)root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc (-1 / +1 lines)
Lines 11-17 Link Here
11
             -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
11
             -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
12
TYPECF32   =
12
TYPECF32   =
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
14
TYPEOPT    = $(TYPEMISC) -O2
14
TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
15
TYPEDBG    = $(TYPEMISC) -g
15
TYPEDBG    = $(TYPEMISC) -g
16
TYPELDSO   = -m32 -shared
16
TYPELDSO   = -m32 -shared
17
TYPESHLIB  = so
17
TYPESHLIB  = so
(-)root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 (-1 / +1 lines)
Lines 11-17 Link Here
11
             -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
11
             -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
12
TYPECF32   =
12
TYPECF32   =
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
14
TYPEOPT    = $(TYPEMISC) -O2
14
TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
15
TYPEDBG    = $(TYPEMISC) -g
15
TYPEDBG    = $(TYPEMISC) -g
16
TYPELDSO   = -shared
16
TYPELDSO   = -shared
17
TYPESHLIB  = so
17
TYPESHLIB  = so
(-)root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 (-1 / +1 lines)
Lines 11-17 Link Here
11
             -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
11
             -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
12
TYPECF32   =
12
TYPECF32   =
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
14
TYPEOPT    = $(TYPEMISC) -O2
14
TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
15
TYPEDBG    = $(TYPEMISC) -g
15
TYPEDBG    = $(TYPEMISC) -g
16
TYPELDSO   = -m64 -shared
16
TYPELDSO   = -m64 -shared
17
TYPESHLIB  = so
17
TYPESHLIB  = so
(-)root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc (-1 / +1 lines)
Lines 13-19 Link Here
13
             -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE)
13
             -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE)
14
TYPECF32   =
14
TYPECF32   =
15
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
15
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
16
TYPEOPT    = $(TYPEMISC) -O2
16
TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
17
TYPEDBG    = $(TYPEMISC) -g
17
TYPEDBG    = $(TYPEMISC) -g
18
TYPELDSO   = -m32 -shared
18
TYPELDSO   = -m32 -shared
19
TYPESHLIB  = so
19
TYPESHLIB  = so
(-)root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 (-1 / +1 lines)
Lines 14-20 Link Here
14
             -wd1572 -wd584 -i-dynamic $(CFTRACE)
14
             -wd1572 -wd584 -i-dynamic $(CFTRACE)
15
TYPECF32   =
15
TYPECF32   =
16
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
16
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
17
TYPEOPT    = $(TYPEMISC) -O2
17
TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
18
TYPEDBG    = $(TYPEMISC) -g
18
TYPEDBG    = $(TYPEMISC) -g
19
TYPELDSO   = -m64 -shared
19
TYPELDSO   = -m64 -shared
20
TYPESHLIB  = so
20
TYPESHLIB  = so
(-)root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos (-1 / +1 lines)
Lines 18-24 Link Here
18
TYPECF32   =
18
TYPECF32   =
19
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
19
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
20
TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
20
TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
21
TYPEOPT    = $(TYPEMISC) $(TYPELINK) -O2
21
TYPEOPT    = $(TYPEMISC) $(TYPELINK) $(CXXFLAGS)
22
TYPEDBG    = $(TYPEMISC) $(TYPELINK) -g
22
TYPEDBG    = $(TYPEMISC) $(TYPELINK) -g
23
ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
23
ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
24
TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m32
24
TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m32
(-)root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 (-1 / +1 lines)
Lines 15-21 Link Here
15
TYPECF32   =
15
TYPECF32   =
16
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
16
TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
17
TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
17
TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
18
TYPEOPT    = $(TYPEMISC) $(TYPELINK) -O2
18
TYPEOPT    = $(TYPEMISC) $(TYPELINK) $(CXXFLAGS)
19
TYPEDBG    = $(TYPEMISC) $(TYPELINK) -g
19
TYPEDBG    = $(TYPEMISC) $(TYPELINK) -g
20
ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
20
ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
21
TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m64
21
TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m64
(-)root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc (-1 / +1 lines)
Lines 11-17 Link Here
11
             -Wall -Wno-deprecated -DSUNGCC $(CFTRACE)
11
             -Wall -Wno-deprecated -DSUNGCC $(CFTRACE)
12
TYPECF32   =
12
TYPECF32   =
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
13
TYPECF64   = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
14
TYPEOPT    = $(TYPEMISC) -O2
14
TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
15
TYPEDBG    = $(TYPEMISC) -g
15
TYPEDBG    = $(TYPEMISC) -g
16
TYPELDSO   = -shared
16
TYPELDSO   = -shared
17
TYPESHLIB  = so
17
TYPESHLIB  = so
(-)root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile (-1 / +1 lines)
Lines 79-85 Link Here
79
79
80
$(TESTBIN): $(OBJECTB) $(LIBDEPS)
80
$(TESTBIN): $(OBJECTB) $(LIBDEPS)
81
	@echo Creating executable $(TESTBIN) 
81
	@echo Creating executable $(TESTBIN) 
82
	$(ECHO)$(LD) $(CFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
82
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
83
83
84
$(OBJDIR)/XrdAccAccess.o: XrdAccAccess.cc     XrdAccAccess.hh \
84
$(OBJDIR)/XrdAccAccess.o: XrdAccAccess.cc     XrdAccAccess.hh \
85
                          XrdAccCapability.hh XrdAccConfig.hh    XrdAccGroups.hh \
85
                          XrdAccCapability.hh XrdAccConfig.hh    XrdAccGroups.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile (-3 / +3 lines)
Lines 49-55 Link Here
49
49
50
$(XRDADLER32): $(XRDADLER32_OBJ)
50
$(XRDADLER32): $(XRDADLER32_OBJ)
51
	@echo Creating executable $(XRDADLER32)
51
	@echo Creating executable $(XRDADLER32)
52
	$(ECHO)$(LD) $(LDOP) $(XRDADLER32_OBJ) $(BINLIBS) $(XRDADLERLIBS) -o $(XRDADLER32) 
52
	$(ECHO)$(LD) $(LDFLAGS) $(XRDADLER32_OBJ) $(BINLIBS) $(XRDADLERLIBS) -o $(XRDADLER32) 
53
53
54
$(XRDADLER32_OBJ): Xrdadler32.cc \
54
$(XRDADLER32_OBJ): Xrdadler32.cc \
55
                   XrdPosixExtern.hh    XrdPosixXrootd.hh \
55
                   XrdPosixExtern.hh    XrdPosixXrootd.hh \
Lines 62-68 Link Here
62
62
63
$(XRDMPXBIN): $(XRDMPXOBJ)
63
$(XRDMPXBIN): $(XRDMPXOBJ)
64
	@echo Creating executable $(XRDMPXBIN)
64
	@echo Creating executable $(XRDMPXBIN)
65
	$(ECHO)$(LD) $(LDOP) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN)
65
	$(ECHO)$(LD) $(LDFLAGS) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN)
66
66
67
$(XRDMPXOBJ): XrdMpxStats.cc \
67
$(XRDMPXOBJ): XrdMpxStats.cc \
68
              XrdNetDNS.hh       XrdNetSocket.hh   XrdNetOpts.hh \
68
              XrdNetDNS.hh       XrdNetSocket.hh   XrdNetOpts.hh \
Lines 74-80 Link Here
74
74
75
$(XRDW41): $(XRDW41_OBJ) $(XRDW41_DEPS)
75
$(XRDW41): $(XRDW41_OBJ) $(XRDW41_DEPS)
76
	@echo Creating executable $(XRDW41)
76
	@echo Creating executable $(XRDW41)
77
	$(ECHO)$(LD) $(LDOP) $(XRDW41_OBJ) $(BINLIBS) $(XRDW41LIBS) -o $(XRDW41)
77
	$(ECHO)$(LD) $(LDFLAGS) $(XRDW41_OBJ) $(BINLIBS) $(XRDW41LIBS) -o $(XRDW41)
78
78
79
$(XRDW41_OBJ): XrdWait41.cc \
79
$(XRDW41_OBJ): XrdWait41.cc \
80
                   XrdOucTList.hh \
80
                   XrdOucTList.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile (-1 / +1 lines)
Lines 74-80 Link Here
74
	          ranlib $(LIBARCH); \
74
	          ranlib $(LIBARCH); \
75
	       fi
75
	       fi
76
	@echo Creating shared library $(LIBRARY) 
76
	@echo Creating shared library $(LIBRARY) 
77
	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
77
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
78
78
79
$(OBJDIR)/XrdBwm.o:  XrdBwm.cc           XrdBwm.hh \
79
$(OBJDIR)/XrdBwm.o:  XrdBwm.cc           XrdBwm.hh \
80
                     XrdAccAuthorize.hh \
80
                     XrdAccAuthorize.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile (-9 / +9 lines)
Lines 166-182 Link Here
166
$(LIBSHARED): $(OBJECTS) $(LIBDEP)
166
$(LIBSHARED): $(OBJECTS) $(LIBDEP)
167
	@echo Creating shared library $(LIBSHARED) 
167
	@echo Creating shared library $(LIBSHARED) 
168
	$(ECHO)rm -f $(LIBSHARED)
168
	$(ECHO)rm -f $(LIBSHARED)
169
	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED)
169
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED)
170
ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
170
ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
171
	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
171
	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
172
	          $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \
172
	          $(LD) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \
173
	fi
173
	fi
174
endif
174
endif
175
175
176
$(LIBRARY_JNI): $(OBJECT_JNI)
176
$(LIBRARY_JNI): $(OBJECT_JNI)
177
	@echo Creating shared library $(LIBRARY_JNI) 
177
	@echo Creating shared library $(LIBRARY_JNI) 
178
	$(ECHO)rm -f $(LIBRARY_JNI);
178
	$(ECHO)rm -f $(LIBRARY_JNI);
179
	$(ECHO)$(CC) $(CFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI)
179
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI)
180
180
181
$(CLASS_JNI_TARGET): $(CLASS_JNI).java
181
$(CLASS_JNI_TARGET): $(CLASS_JNI).java
182
	@echo Creating JNI class file $(CLASS_JNI_TARGET)
182
	@echo Creating JNI class file $(CLASS_JNI_TARGET)
Lines 184-210 Link Here
184
184
185
$(BINDIR)/TestXrdClient_read: $(OBJECTS) $(OBJECTD) $(LIBDEPS)
185
$(BINDIR)/TestXrdClient_read: $(OBJECTS) $(OBJECTD) $(LIBDEPS)
186
	@echo Creating executable $(BINDIR)/TestXrdClient_read 
186
	@echo Creating executable $(BINDIR)/TestXrdClient_read 
187
	$(ECHO)$(LD) $(LDOP) $(OBJECTD) $(BINLIBS) $(LIBM) $(LIBS) -o $(BINDIR)/TestXrdClient_read
187
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTD) $(BINLIBS) $(LIBM) $(LIBS) -o $(BINDIR)/TestXrdClient_read
188
188
189
$(BINDIR)/TestXrdClient: $(OBJECTS) $(OBJECTB) $(LIBDEPS)
189
$(BINDIR)/TestXrdClient: $(OBJECTS) $(OBJECTB) $(LIBDEPS)
190
	@echo Creating executable $(BINDIR)/TestXrdClient 
190
	@echo Creating executable $(BINDIR)/TestXrdClient 
191
	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBM) $(LIBS) -o $(BINDIR)/TestXrdClient
191
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBM) $(LIBS) -o $(BINDIR)/TestXrdClient
192
192
193
$(XRDCP): $(OBJECTS) $(OBJECTC) $(LIBDEPS)
193
$(XRDCP): $(OBJECTS) $(OBJECTC) $(LIBDEPS)
194
	@echo Creating executable $(XRDCP) 
194
	@echo Creating executable $(XRDCP) 
195
	$(ECHO)$(LD) $(LDOP) $(OBJECTC) $(BINLIBS) $(LIBM) $(LIBS) $(LIBZ) -o $(XRDCP)
195
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTC) $(BINLIBS) $(LIBM) $(LIBS) $(LIBZ) -o $(XRDCP)
196
196
197
$(XRDPREPTOOL): $(OBJECTS) $(OBJECT_PREPTOOL) $(LIBDEPS)
197
$(XRDPREPTOOL): $(OBJECTS) $(OBJECT_PREPTOOL) $(LIBDEPS)
198
	@echo Creating executable $(XRDPREPTOOL)
198
	@echo Creating executable $(XRDPREPTOOL)
199
	$(ECHO)$(LD) $(LDOP) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDPREPTOOL)
199
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDPREPTOOL)
200
200
201
$(XRDSTAGETOOL): $(OBJECTS) $(OBJECT_STAGETOOL) $(LIBDEPS)
201
$(XRDSTAGETOOL): $(OBJECTS) $(OBJECT_STAGETOOL) $(LIBDEPS)
202
	@echo Creating executable $(XRDSTAGETOOL) 
202
	@echo Creating executable $(XRDSTAGETOOL) 
203
	$(ECHO)$(LD) $(LDOP) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDSTAGETOOL)
203
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDSTAGETOOL)
204
204
205
$(XRDCLI): $(OBJECTS) $(OBJECT_CLI) $(LIBDEPS)
205
$(XRDCLI): $(OBJECTS) $(OBJECT_CLI) $(LIBDEPS)
206
	@echo Creating executable $(XRDCLI) 
206
	@echo Creating executable $(XRDCLI) 
207
	$(ECHO)$(LD) $(LDOP) $(OBJECT_CLI) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDCLI)
207
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECT_CLI) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDCLI)
208
208
209
$(XRDADMIN): $(PERLMOD)
209
$(XRDADMIN): $(PERLMOD)
210
	$(ECHO)if [ "$(PERLBIN)" != "" ]; then \
210
	$(ECHO)if [ "$(PERLBIN)" != "" ]; then \
(-)root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile (-1 / +1 lines)
Lines 136-142 Link Here
136
136
137
$(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS)
137
$(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS)
138
	@echo Creating executable $(BINARY) 
138
	@echo Creating executable $(BINARY) 
139
	$(ECHO)$(LD) $(LDOP) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
139
	$(ECHO)$(LD) $(LDFLAGS) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
140
140
141
141
142
$(LIBRARY): $(OBJCLNT) $(OBJBOTH)
142
$(LIBRARY): $(OBJCLNT) $(OBJBOTH)
(-)root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile (-2 / +2 lines)
Lines 88-98 Link Here
88
88
89
$(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP)
89
$(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP)
90
	@echo Creating executable $(BINDIR)/XrdCnsd
90
	@echo Creating executable $(BINDIR)/XrdCnsd
91
	$(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd
91
	$(ECHO)$(LD) $(LDFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd
92
92
93
$(TARGSSI): $(OBJSSI) $(OBJCOM) $(LIBDEP)
93
$(TARGSSI): $(OBJSSI) $(OBJCOM) $(LIBDEP)
94
	@echo Creating executable $(BINDIR)/cns_ssi
94
	@echo Creating executable $(BINDIR)/cns_ssi
95
	$(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi
95
	$(ECHO)$(LD) $(LDFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi
96
96
97
$(OBJDIR)/XrdCnsConfig.o:  XrdCnsConfig.hh    XrdCnsConfig.cc \
97
$(OBJDIR)/XrdCnsConfig.o:  XrdCnsConfig.hh    XrdCnsConfig.cc \
98
                           XrdCnsDaemon.hh    XrdCnsLogRec.hh \
98
                           XrdCnsDaemon.hh    XrdCnsLogRec.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile (-3 / +3 lines)
Lines 155-161 Link Here
155
155
156
$(LIBRARY): $(OBJECTS) $(LIBUTIL)
156
$(LIBRARY): $(OBJECTS) $(LIBUTIL)
157
	@echo Creating shared library $(LIBRARY) 
157
	@echo Creating shared library $(LIBRARY) 
158
	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY)
158
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY) $(TYPELIBS)
159
159
160
$(LIBASSL): $(OBJCSSL)
160
$(LIBASSL): $(OBJCSSL)
161
	@echo Creating archive $(LIBASSL) 
161
	@echo Creating archive $(LIBASSL) 
Lines 165-175 Link Here
165
165
166
$(LIBCSSL): $(OBJCSSL) $(LIBARCH) $(LIBUTIL)
166
$(LIBCSSL): $(OBJCSSL) $(LIBARCH) $(LIBUTIL)
167
	@echo Creating shared library $(LIBCSSL) 
167
	@echo Creating shared library $(LIBCSSL) 
168
	$(ECHO)$(LD) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL)
168
	$(ECHO)$(LD) $(LDFLAGS) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL)
169
169
170
$(CRYPTOTEST): $(OBJECTA) $(LIBARCH) $(LIBDEPS)
170
$(CRYPTOTEST): $(OBJECTA) $(LIBARCH) $(LIBDEPS)
171
	@echo Creating executable $(CRYPTOTEST) 
171
	@echo Creating executable $(CRYPTOTEST) 
172
	$(ECHO)$(LD) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST)
172
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST)
173
173
174
$(OBJDIR)/XrdCryptotest.o: XrdCryptotest.cc XrdSutAux.hh XProtocol.hh XrdSutBucket.hh \
174
$(OBJDIR)/XrdCryptotest.o: XrdCryptotest.cc XrdSutAux.hh XProtocol.hh XrdSutBucket.hh \
175
			   XrdCryptoAux.hh XrdCryptoFactory.hh XrdCryptoCipher.hh \
175
			   XrdCryptoAux.hh XrdCryptoFactory.hh XrdCryptoCipher.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile (-3 / +3 lines)
Lines 110-124 Link Here
110
110
111
$(BINADMIN): $(OBJLIB) $(OBJADMIN)           $(OBJDEPS)
111
$(BINADMIN): $(OBJLIB) $(OBJADMIN)           $(OBJDEPS)
112
	@echo Creating executable $(BINADMIN)
112
	@echo Creating executable $(BINADMIN)
113
	$(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN)
113
	$(ECHO)$(LD) $(LDFLAGS) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN)
114
114
115
$(BINPSTGA): $(OBJLIB) $(OBJPSTG) $(OBJADDS) $(OBJDEPS)
115
$(BINPSTGA): $(OBJLIB) $(OBJPSTG) $(OBJADDS) $(OBJDEPS)
116
	@echo Creating executable $(BINPSTGA)
116
	@echo Creating executable $(BINPSTGA)
117
	$(ECHO)$(LD) $(LDOP) $(OBJPSTG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPSTGA)
117
	$(ECHO)$(LD) $(LDFLAGS) $(OBJPSTG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPSTGA)
118
118
119
$(BINPSTGD): $(OBJLIB) $(OBJPSTG) $(OBJADDS) $(OBJDEPS)
119
$(BINPSTGD): $(OBJLIB) $(OBJPSTG) $(OBJADDS) $(OBJDEPS)
120
	@echo Creating executable $(BINPSTGD)
120
	@echo Creating executable $(BINPSTGD)
121
	$(ECHO)$(LD) $(LDOP) $(OBJPSTG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPSTGD)
121
	$(ECHO)$(LD) $(LDFLAGS) $(OBJPSTG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPSTGD)
122
122
123
$(OBJDIR)/XrdFrmAdmin.o:  XrdFrmAdmin.hh    XrdFrmAdmin.cc  XrdFrmTrace.hh \
123
$(OBJDIR)/XrdFrmAdmin.o:  XrdFrmAdmin.hh    XrdFrmAdmin.cc  XrdFrmTrace.hh \
124
                          XrdFrmConfig.hh   XrdFrmUtils.hh  \
124
                          XrdFrmConfig.hh   XrdFrmUtils.hh  \
(-)root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile (-16 / +16 lines)
Lines 160-186 Link Here
160
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
160
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
161
		if [ "x$(SUNCACHE)" != "x" ]; then \
161
		if [ "x$(SUNCACHE)" != "x" ]; then \
162
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
162
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
163
			$(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys; \
163
			$(LD) $(LDFLAGS) lib_temp.a $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys; \
164
			rm lib_temp.a; \
164
			rm lib_temp.a; \
165
		fi; \
165
		fi; \
166
	else \
166
	else \
167
		$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys; \
167
		$(LD) $(LDFLAGS) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys; \
168
	fi
168
	fi
169
$(DECODER):	$(OBJECTS_BIN_DEC) $(LIBRARY_DEC) $(LIBRARY_OUC) \
169
$(DECODER):	$(OBJECTS_BIN_DEC) $(LIBRARY_DEC) $(LIBRARY_OUC) \
170
	$(LIBRARY_COMMON) 
170
	$(LIBRARY_COMMON) 
171
	@echo Creating executable $(@F)
171
	@echo Creating executable $(@F)
172
	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
172
	$(ECHO)$(LD) $(LDFLAGS) $(LIBS) -o $@ $^
173
173
174
$(SENDER):	$(OBJECTS_BIN_SND) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
174
$(SENDER):	$(OBJECTS_BIN_SND) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
175
	@echo Creating executable $(@F)
175
	@echo Creating executable $(@F)
176
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
176
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
177
		if [ "x$(SUNCACHE)" != "x" ]; then \
177
		if [ "x$(SUNCACHE)" != "x" ]; then \
178
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
178
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
179
			$(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
179
			$(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
180
			rm lib_temp.a; \
180
			rm lib_temp.a; \
181
		fi; \
181
		fi; \
182
	else \
182
	else \
183
		$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \
183
		$(LD) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \
184
	fi
184
	fi
185
185
186
$(FSENDER):	$(OBJECTS_BIN_FSD) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
186
$(FSENDER):	$(OBJECTS_BIN_FSD) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
Lines 188-198 Link Here
188
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
188
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
189
		if [ "x$(SUNCACHE)" != "x" ]; then \
189
		if [ "x$(SUNCACHE)" != "x" ]; then \
190
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
190
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
191
			$(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
191
			$(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
192
			rm lib_temp.a; \
192
			rm lib_temp.a; \
193
		fi; \
193
		fi; \
194
	else \
194
	else \
195
		$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \
195
		$(LD) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \
196
	fi
196
	fi
197
197
198
$(ADMIN):	$(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
198
$(ADMIN):	$(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
Lines 200-210 Link Here
200
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
200
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
201
		if [ "x$(SUNCACHE)" != "x" ]; then \
201
		if [ "x$(SUNCACHE)" != "x" ]; then \
202
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
202
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
203
			$(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
203
			$(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
204
			rm lib_temp.a; \
204
			rm lib_temp.a; \
205
		fi; \
205
		fi; \
206
	else \
206
	else \
207
		$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \
207
		$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \
208
	fi
208
	fi
209
209
210
$(COUT2FILE):	$(OBJECTS_BIN_C2F) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
210
$(COUT2FILE):	$(OBJECTS_BIN_C2F) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
Lines 212-246 Link Here
212
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
212
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
213
		if [ "x$(SUNCACHE)" != "x" ]; then \
213
		if [ "x$(SUNCACHE)" != "x" ]; then \
214
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
214
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
215
			$(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
215
			$(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
216
			rm lib_temp.a; \
216
			rm lib_temp.a; \
217
		fi; \
217
		fi; \
218
	else \
218
	else \
219
		$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \
219
		$(LD) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \
220
	fi
220
	fi
221
221
222
$(DUMPPACKETS):	$(OBJECTS_BIN_DMP) $(LIBRARY_DEC) $(LIBRARY_COMMON) 
222
$(DUMPPACKETS):	$(OBJECTS_BIN_DMP) $(LIBRARY_DEC) $(LIBRARY_COMMON) 
223
	@echo Creating executable $(@F)
223
	@echo Creating executable $(@F)
224
	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
224
	$(ECHO)$(LD) $(LDFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
225
225
226
$(DEBUGPACKET):	$(OBJECTS_BIN_DBP) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
226
$(DEBUGPACKET):	$(OBJECTS_BIN_DBP) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
227
	@echo Creating executable $(@F)
227
	@echo Creating executable $(@F)
228
	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
228
	$(ECHO)$(LD) $(LDFLAGS) $(LIBS) -o $@ $^
229
229
230
$(CONVTIME):	$(OBJECTS_BIN_CTM) $(LIBRARY_COMMON) 
230
$(CONVTIME):	$(OBJECTS_BIN_CTM) $(LIBRARY_COMMON) 
231
	@echo Creating executable $(@F)
231
	@echo Creating executable $(@F)
232
	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
232
	$(ECHO)$(LD) $(LDFLAGS) $(LIBS) -o $@ $^
233
233
234
$(TESTPARSER):	$(OBJECTS_BIN_TPR) $(LIBRARY_COMMON)
234
$(TESTPARSER):	$(OBJECTS_BIN_TPR) $(LIBRARY_COMMON)
235
	@echo Creating executable $(@F)
235
	@echo Creating executable $(@F)
236
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
236
	$(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \
237
		if [ "x$(SUNCACHE)" != "x" ]; then \
237
		if [ "x$(SUNCACHE)" != "x" ]; then \
238
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
238
			$(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \
239
			$(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
239
			$(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \
240
			rm lib_temp.a; \
240
			rm lib_temp.a; \
241
		fi; \
241
		fi; \
242
	else \
242
	else \
243
		$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \
243
		$(LD) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \
244
	fi
244
	fi
245
245
246
$(OBJDIR)/%.o : %.cc
246
$(OBJDIR)/%.o : %.cc
(-)root.orig/net/xrootd/src/xrootd/src/XrdOdc/GNUmakefile (-1 / +1 lines)
Lines 79-85 Link Here
79
79
80
$(TESTBIN): $(OBJECTB) $(LIBDEPS)
80
$(TESTBIN): $(OBJECTB) $(LIBDEPS)
81
	@echo Creating executable $(TESTBIN) 
81
	@echo Creating executable $(TESTBIN) 
82
	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
82
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
83
83
84
$(OBJDIR)/XrdOdcConfig.o: XrdOdcConfig.hh XrdOdcMsg.hh     XrdOdcTrace.hh \
84
$(OBJDIR)/XrdOdcConfig.o: XrdOdcConfig.hh XrdOdcMsg.hh     XrdOdcTrace.hh \
85
                          XrdOuca2x.hh    XrdOucStream.hh  XrdOucTList.hh  \
85
                          XrdOuca2x.hh    XrdOucStream.hh  XrdOucTList.hh  \
(-)root.orig/net/xrootd/src/xrootd/src/XrdOfs/GNUmakefile (-1 / +1 lines)
Lines 84-90 Link Here
84
	          ranlib $(LIBARCH); \
84
	          ranlib $(LIBARCH); \
85
	       fi
85
	       fi
86
	@echo Creating shared library $(LIBRARY) 
86
	@echo Creating shared library $(LIBRARY) 
87
	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
87
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
88
88
89
$(OBJDIR)/XrdOfs.o:  XrdOfs.cc             XrdOfs.hh \
89
$(OBJDIR)/XrdOfs.o:  XrdOfs.cc             XrdOfs.hh \
90
                     XrdOfsHandle.hh       XrdOfsEvs.hh     XrdOfsStats.hh \
90
                     XrdOfsHandle.hh       XrdOfsEvs.hh     XrdOfsStats.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdOlb/GNUmakefile (-1 / +1 lines)
Lines 82-88 Link Here
82
82
83
$(BINARY): $(OBJECTS) $(LIBDEPS)
83
$(BINARY): $(OBJECTS) $(LIBDEPS)
84
	@echo Creating executable $(BINARY) 
84
	@echo Creating executable $(BINARY) 
85
	$(ECHO)$(LD) $(LDOP) $(OBJECTS) $(BINLIBS) $(LIBS) -o $(BINARY)
85
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(BINLIBS) $(LIBS) -o $(BINARY)
86
86
87
$(OBJDIR)/XrdOlbAdmin.o:  XrdOlbAdmin.hh    XrdOlbAdmin.cc \
87
$(OBJDIR)/XrdOlbAdmin.o:  XrdOlbAdmin.hh    XrdOlbAdmin.cc \
88
                          XrdNetSocket.hh \
88
                          XrdNetSocket.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile (-3 / +3 lines)
Lines 83-96 Link Here
83
83
84
$(LIBPLDR): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
84
$(LIBPLDR): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
85
	@echo Creating shared library $(LIBPLDR)
85
	@echo Creating shared library $(LIBPLDR)
86
	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
86
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
87
87
88
$(LIBRARY): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
88
$(LIBRARY): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
89
	@echo Creating shared library $(LIBRARY) 
89
	@echo Creating shared library $(LIBRARY) 
90
	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
90
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
91
ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
91
ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
92
	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
92
	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
93
	   $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
93
	   $(LD) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
94
	fi
94
	fi
95
endif
95
endif
96
# MacOS X does not support linking against shared libraries so include
96
# MacOS X does not support linking against shared libraries so include
(-)root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile (-1 / +1 lines)
Lines 65-71 Link Here
65
65
66
$(TARGETS): $(OBJECTS) $(OBJECTT) $(LIBDEP)
66
$(TARGETS): $(OBJECTS) $(OBJECTT) $(LIBDEP)
67
	@echo Creating shared library $(LIBRARY) 
67
	@echo Creating shared library $(LIBRARY) 
68
	$(ECHO)$(CC) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
68
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
69
69
70
$(OBJDIR)/XrdPss.o:  XrdPss.cc         XrdPss.hh      XrdPosixXrootd.hh \
70
$(OBJDIR)/XrdPss.o:  XrdPss.cc         XrdPss.hh      XrdPosixXrootd.hh \
71
                     XrdOss.hh         XrdOssError.hh XrdOucEnv.hh \
71
                     XrdOss.hh         XrdOssError.hh XrdOucEnv.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile (-2 / +2 lines)
Lines 6-12 Link Here
6
  
6
  
7
include ../GNUmake.env
7
include ../GNUmake.env
8
8
9
LFLAGS  = -L$(LIBDIR) -lXrdOuc $(LDSO)
9
LFLAGS  = $(LDSO) -L$(LIBDIR) -lXrdOuc
10
10
11
LIBDEPS = $(LIBDIR)/libXrdOuc.a
11
LIBDEPS = $(LIBDIR)/libXrdOuc.a
12
12
Lines 48-54 Link Here
48
48
49
$(TARGETS): $(OBJECTS) $(LIBDEPS)
49
$(TARGETS): $(OBJECTS) $(LIBDEPS)
50
	@echo Creating shared library $(LIBRARY) 
50
	@echo Creating shared library $(LIBRARY) 
51
	$(ECHO)$(CC) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
51
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
52
52
53
$(OBJDIR)/XrdRootdProtocol.o: XrdRootdProtocol.hh XrdLink.hh \
53
$(OBJDIR)/XrdRootdProtocol.o: XrdRootdProtocol.hh XrdLink.hh \
54
                              XrdScheduler.hh     XrdTrace.hh \
54
                              XrdScheduler.hh     XrdTrace.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile (-3 / +3 lines)
Lines 85-99 Link Here
85
85
86
$(LIBRARY): $(OBJSLIB) $(LIBDEPS)
86
$(LIBRARY): $(OBJSLIB) $(LIBDEPS)
87
	@echo Creating shared library $(LIBRARY) 
87
	@echo Creating shared library $(LIBRARY) 
88
	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
88
	$(ECHO)$(LD) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
89
89
90
$(TSTBINA): $(OBJECTA) $(LIBDEPS)
90
$(TSTBINA): $(OBJECTA) $(LIBDEPS)
91
	@echo Creating executable $(TSTBINA) 
91
	@echo Creating executable $(TSTBINA) 
92
	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
92
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
93
93
94
$(TSTBINB): $(OBJECTB) $(LIBDEPS)
94
$(TSTBINB): $(OBJECTB) $(LIBDEPS)
95
	@echo Creating executable $(TSTBINB) 
95
	@echo Creating executable $(TSTBINB) 
96
	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
96
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
97
97
98
$(OBJDIR)/XrdSecClient.o: XrdSysPthread.hh XrdSecPManager.hh XrdSecInterface.hh \
98
$(OBJDIR)/XrdSecClient.o: XrdSysPthread.hh XrdSecPManager.hh XrdSecInterface.hh \
99
                          XrdOucErrInfo.hh XrdSecClient.cc   XrdSecEntity.hh
99
                          XrdOucErrInfo.hh XrdSecClient.cc   XrdSecEntity.hh
(-)root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile (-4 / +4 lines)
Lines 114-132 Link Here
114
114
115
$(LIBRARY): $(OBJECTS) $(LIBDEPS)
115
$(LIBRARY): $(OBJECTS) $(LIBDEPS)
116
	@echo Creating shared library $(LIBRARY) 
116
	@echo Creating shared library $(LIBRARY) 
117
	$(ECHO)$(LD) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
117
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
118
118
119
$(LIBLDAP): $(OBJECTC)
119
$(LIBLDAP): $(OBJECTC)
120
	@echo Creating shared library $(LIBLDAP) 
120
	@echo Creating shared library $(LIBLDAP) 
121
	$(ECHO)$(LD) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBLDAP)
121
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBLDAP)
122
122
123
$(SECGSITEST): $(OBJECTA) $(LIBDEPS)
123
$(SECGSITEST): $(OBJECTA) $(LIBDEPS)
124
	@echo Creating executable $(SECGSITEST) 
124
	@echo Creating executable $(SECGSITEST) 
125
	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
125
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
126
126
127
$(SECGSIPROXY): $(OBJECTB) $(LIBDEPS)
127
$(SECGSIPROXY): $(OBJECTB) $(LIBDEPS)
128
	@echo Creating executable $(SECGSIPROXY) 
128
	@echo Creating executable $(SECGSIPROXY) 
129
	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
129
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
130
130
131
$(OBJDIR)/XrdSecgsitest.o: XrdSecgsitest.cc XrdOucString.hh \
131
$(OBJDIR)/XrdSecgsitest.o: XrdSecgsitest.cc XrdOucString.hh \
132
		XrdSysError.hh XrdSutAux.hh XProtocol.hh XPtypes.hh XrdCryptoAux.hh \
132
		XrdSysError.hh XrdSutAux.hh XProtocol.hh XPtypes.hh XrdCryptoAux.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile (-1 / +1 lines)
Lines 45-51 Link Here
45
45
46
$(TARGETS): $(OBJECTS) $(LIBDEPS)
46
$(TARGETS): $(OBJECTS) $(LIBDEPS)
47
	@echo Creating shared library $(TARGETS) 
47
	@echo Creating shared library $(TARGETS) 
48
	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
48
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
49
49
50
$(OBJDIR)/XrdSecProtocolkrb4.o: XrdSecProtocolkrb4.cc XrdSecInterface.hh \
50
$(OBJDIR)/XrdSecProtocolkrb4.o: XrdSecProtocolkrb4.cc XrdSecInterface.hh \
51
                                XrdSysPthread.hh      XrdOucTokenizer.hh \
51
                                XrdSysPthread.hh      XrdOucTokenizer.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile (-1 / +1 lines)
Lines 47-53 Link Here
47
47
48
$(TARGETS): $(OBJECTS) $(LIBDEPS)
48
$(TARGETS): $(OBJECTS) $(LIBDEPS)
49
	@echo Creating shared library $(TARGETS) 
49
	@echo Creating shared library $(TARGETS) 
50
	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
50
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
51
51
52
$(OBJDIR)/XrdSecProtocolkrb5.o: XrdSecProtocolkrb5.cc XrdSecInterface.hh \
52
$(OBJDIR)/XrdSecProtocolkrb5.o: XrdSecProtocolkrb5.cc XrdSecInterface.hh \
53
                                XrdSysPthread.hh      XrdOucTokenizer.hh \
53
                                XrdSysPthread.hh      XrdOucTokenizer.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile (-2 / +2 lines)
Lines 65-75 Link Here
65
65
66
$(LIBRARY): $(OBJECTS) $(LIBDEPS)
66
$(LIBRARY): $(OBJECTS) $(LIBDEPS)
67
	@echo Creating shared library $(LIBRARY) 
67
	@echo Creating shared library $(LIBRARY) 
68
	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
68
	$(ECHO)$(LD) $(LDFLAGS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
69
69
70
$(SRVADMIN): $(OBJECTA) $(LIBDEPS)
70
$(SRVADMIN): $(OBJECTA) $(LIBDEPS)
71
	@echo Creating executable $(SRVADMIN) 
71
	@echo Creating executable $(SRVADMIN) 
72
	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
72
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
73
73
74
$(OBJDIR)/XrdSecpwdSrvAdmin.o: XrdSecpwdSrvAdmin.cc \
74
$(OBJDIR)/XrdSecpwdSrvAdmin.o: XrdSecpwdSrvAdmin.cc \
75
		XrdOucString.hh XrdSutAux.hh XProtocol.hh XPtypes.hh \
75
		XrdOucString.hh XrdSutAux.hh XProtocol.hh XPtypes.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile (-2 / +2 lines)
Lines 69-79 Link Here
69
69
70
$(TARGLIB): $(OBJSLIB) $(LIBDEPS)
70
$(TARGLIB): $(OBJSLIB) $(LIBDEPS)
71
	@echo Creating shared library $(TARGLIB)
71
	@echo Creating shared library $(TARGLIB)
72
	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLIB);
72
	$(ECHO)$(LD) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLIB);
73
73
74
$(TARGBIN): $(OBJSBIN)
74
$(TARGBIN): $(OBJSBIN)
75
	@echo Creating executable $(TARGBIN)
75
	@echo Creating executable $(TARGBIN)
76
	$(ECHO)$(LD) $(LDOP) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
76
	$(ECHO)$(LD) $(LDFLAGS) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
77
77
78
$(OBJDIR)/XrdSecProtocolsss.o: XrdSecProtocolsss.cc    XrdSecProtocolsss.hh \
78
$(OBJDIR)/XrdSecProtocolsss.o: XrdSecProtocolsss.cc    XrdSecProtocolsss.hh \
79
                               XrdNetDNS.hh            XrdOucErrInfo.hh \
79
                               XrdNetDNS.hh            XrdOucErrInfo.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile (-1 / +1 lines)
Lines 45-51 Link Here
45
45
46
$(TARGETS): $(OBJECTS) $(LIBDEPS)
46
$(TARGETS): $(OBJECTS) $(LIBDEPS)
47
	@echo Creating shared library $(TARGETS) 
47
	@echo Creating shared library $(TARGETS) 
48
	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
48
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
49
49
50
$(OBJDIR)/XrdSecProtocolunix.o: XrdSecProtocolunix.cc XrdSecInterface.hh \
50
$(OBJDIR)/XrdSecProtocolunix.o: XrdSecProtocolunix.cc XrdSecInterface.hh \
51
                                XrdSysHeaders.hh \
51
                                XrdSysHeaders.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile (-1 / +1 lines)
Lines 75-81 Link Here
75
75
76
$(LIBRARY): $(OBJECTS) $(LIBDIR)/libXrdOuc.a
76
$(LIBRARY): $(OBJECTS) $(LIBDIR)/libXrdOuc.a
77
	@echo Creating shared library $(LIBRARY) 
77
	@echo Creating shared library $(LIBRARY) 
78
	$(ECHO)$(CC) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY)
78
	$(ECHO)$(LD) $(LDFLAGS) $(LDSO) $(OBJECTS) $(LIBDIR)/libXrdOuc.a -o $(LIBRARY)
79
79
80
$(OBJDIR)/XrdSutPFAdmin.o: XrdSutPFAdmin.cc XrdOucString.hh \
80
$(OBJDIR)/XrdSutPFAdmin.o: XrdSutPFAdmin.cc XrdOucString.hh \
81
		XrdSutAux.hh XProtocol.hh XPtypes.hh \
81
		XrdSutAux.hh XProtocol.hh XPtypes.hh \
(-)root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile (-1 / +1 lines)
Lines 85-91 Link Here
85
85
86
$(TARGETS): $(OBJECTS) $(OBJDEPS)
86
$(TARGETS): $(OBJECTS) $(OBJDEPS)
87
	@echo Creating executable $(TARGETS) 
87
	@echo Creating executable $(TARGETS) 
88
	$(ECHO)$(LD) $(LDOP) $(OBJECTS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
88
	$(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
89
89
90
$(OBJDIR)/XrdXrootdAdmin.o: XrdXrootdAdmin.hh      XrdXrootdAdmin.cc \
90
$(OBJDIR)/XrdXrootdAdmin.o: XrdXrootdAdmin.hh      XrdXrootdAdmin.cc \
91
                            XrdXrootdTrace.hh      XrdXrootdProtocol.hh \
91
                            XrdXrootdTrace.hh      XrdXrootdProtocol.hh \

Return to bug 298284