diff -ur lcgdm-1.7.4.4.orig/config/Imake.rules lcgdm-1.7.4.4/config/Imake.rules
--- lcgdm-1.7.4.4.orig/config/Imake.rules 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/config/Imake.rules 2010-03-29 19:33:39.744544929 +0200
@@ -95,7 +95,7 @@
#ifndef NormalProgramTarget
#define NormalProgramTarget(program,objects,deplibs,libs) \
ProgramTargetName(program): objects deplibs @@\
- $(LD) -o $@ $(LDFLAGS) objects libs
+ $(CC) -o $@ $(LDFLAGS) objects libs
#endif
#ifndef MakeSubdirs
diff -ur lcgdm-1.7.4.4.orig/config/Win32.rules lcgdm-1.7.4.4/config/Win32.rules
--- lcgdm-1.7.4.4.orig/config/Win32.rules 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/config/Win32.rules 2010-03-29 19:33:39.744544929 +0200
@@ -41,7 +41,7 @@
#define NormalProgramTarget(program,objects,deplibs,libs) \
ProgramTargetName(program): objects deplibs @@\
- $(LD) @<< @@\
+ $(CC) @<< @@\
/out:$@ $(LDFLAGS) objects libs @@\
<<
diff -ur lcgdm-1.7.4.4.orig/dicomcopy/Imakefile lcgdm-1.7.4.4/dicomcopy/Imakefile
--- lcgdm-1.7.4.4.orig/dicomcopy/Imakefile 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/dicomcopy/Imakefile 2010-03-29 19:33:39.744544929 +0200
@@ -146,7 +146,7 @@
NormalLibraryTarget(dicomcopy,dicomcopy_inc_reqctr.Osuf send2dicomcopyd.Osuf)
SharedLibraryTargetName(dpm_dicom): dpm_dicomcopyfile.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf
+ $(CC) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf
install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL)
diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
--- lcgdm-1.7.4.4.orig/dpm/Imakefile 2010-03-29 19:33:17.300544220 +0200
+++ lcgdm-1.7.4.4/dpm/Imakefile 2010-03-29 19:36:35.762544752 +0200
@@ -418,21 +418,21 @@
RemoveFiles(dpm_perlwrap.o dpm_perlwrap.c)
$(SWIG) -perl -I$(INCLUDES) -DNSTYPE_DPNS -o dpm_perlwrap.c dpm.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE -DNSTYPE_DPNS dpm_perlwrap.c
- $(LD) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(LIBS) -ldpm
+ $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(LIBS) -ldpm
dpm.py : _dpm.so
_dpm.so : dpm.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
RemoveFiles(dpm_wrap.o dpm_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_DPNS dpm.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(LIBS) -ldpm
+ $(CC) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(LIBS) -ldpm
dpm2.py : _dpm2.so
_dpm2.so : dpm2.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
RemoveFiles(dpm2_wrap.o dpm2_wrap.c)
$(SWIG) -python -I$(INCLUDES) -I../ns -DNSTYPE_DPNS dpm2.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm2_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(LIBS) -ldpm
+ $(CC) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(LIBS) -ldpm
InstallTarget(dpm.so,root,root,0755,$(PERLDIR))
InstallTarget(dpm.pm,root,root,0644,$(PERLDIR))
diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
--- lcgdm-1.7.4.4.orig/ns/Imakefile.lfc 2010-03-29 19:33:17.301544486 +0200
+++ lcgdm-1.7.4.4/ns/Imakefile.lfc 2010-03-29 19:36:57.283545361 +0200
@@ -466,14 +466,14 @@
RemoveFiles(lfc_perlwrap.o lfc_perlwrap.c)
$(SWIG) -perl -I$(INCLUDES) -DNSTYPE_LFC -o lfc_perlwrap.c lfc.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE lfc_perlwrap.c
- $(LD) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(LIBS) -llfc
lfc.py : _lfc.so
_lfc.so : lfc.i ../h/lfc_api.h ../h/Cns_api.h
RemoveFiles(lfc_wrap.o lfc_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(LIBS) -llfc
InstallTarget(lfc.so,root,root,0755,$(PERLDIR))
InstallTarget(lfc.pm,root,root,0644,$(PERLDIR))
@@ -485,7 +485,7 @@
RemoveFiles(lfc2_wrap.o lfc2_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR))
InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR))
@@ -495,7 +495,7 @@
RemoveFiles(lfcthr_wrap.o lfcthr_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfcthr.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfcthr_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR))
InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR))
@@ -505,7 +505,7 @@
RemoveFiles(lfc2thr_wrap.o lfc2thr_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2thr.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2thr_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR))
InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR))
diff -ur lcgdm-1.7.4.4.orig/scripts/RLS-Atlas-migration/bin/Makefile lcgdm-1.7.4.4/scripts/RLS-Atlas-migration/bin/Makefile
--- lcgdm-1.7.4.4.orig/scripts/RLS-Atlas-migration/bin/Makefile 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/scripts/RLS-Atlas-migration/bin/Makefile 2010-03-29 19:33:39.746544622 +0200
@@ -41,11 +41,11 @@
all: $(PROGS)
migrate_info: migrate_info.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_info.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_info.o $(LIBS)
migrate_path: migrate_path.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
migrate_files: migrate_files.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
../../LCG-DM/ns/libns.a: FORCE
cd ../../LCG-DM/ns ; $(MAKE) libns.a
diff -ur lcgdm-1.7.4.4.orig/scripts/RLS-Cms-migration/bin/Makefile lcgdm-1.7.4.4/scripts/RLS-Cms-migration/bin/Makefile
--- lcgdm-1.7.4.4.orig/scripts/RLS-Cms-migration/bin/Makefile 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/scripts/RLS-Cms-migration/bin/Makefile 2010-03-29 19:33:39.747544678 +0200
@@ -41,11 +41,11 @@
all: $(PROGS)
migrate_info: migrate_info.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_info.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_info.o $(LIBS)
migrate_path: migrate_path.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
migrate_files: migrate_files.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
../../../ns/libns.a: FORCE
cd ../../../ns ; $(MAKE) libns.a
diff -ur lcgdm-1.7.4.4.orig/scripts/RLS-migration/bin/Makefile lcgdm-1.7.4.4/scripts/RLS-migration/bin/Makefile
--- lcgdm-1.7.4.4.orig/scripts/RLS-migration/bin/Makefile 2010-03-29 16:21:44.000000000 +0200
+++ lcgdm-1.7.4.4/scripts/RLS-migration/bin/Makefile 2010-03-29 19:33:39.747544678 +0200
@@ -39,9 +39,9 @@
all: $(PROGS)
migrate_path: migrate_path.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
migrate_files: migrate_files.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
../../../ns/libns.a: FORCE
cd ../../../ns ; $(MAKE) libns.a
diff -ur lcgdm-1.7.4.4.orig/security/Imakefile lcgdm-1.7.4.4/security/Imakefile
--- lcgdm-1.7.4.4.orig/security/Imakefile 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/security/Imakefile 2010-03-29 19:33:39.748544664 +0200
@@ -165,10 +165,10 @@
#if UseGSI
SharedLibraryTargetName(Csec_plugin_GSI_thread): Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf SecLibsGSIpthr $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf SecLibsGSIpthr $(SHLIBREQLIBS)
SharedLibraryTargetName(Csec_plugin_GSI): Csec_plugin_GSI.Osuf Csec_plugin_GSI_mapper.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI.Osuf Csec_plugin_GSI_mapper.Osuf SecLibsGSI $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI.Osuf Csec_plugin_GSI_mapper.Osuf SecLibsGSI $(SHLIBREQLIBS)
Csec_plugin_GSI.Osuf: Csec_plugin_GSS.c
$(CC) $(CFLAGS) SecAuthMechGSI SecIncludeDirGSI -o $@ -c Csec_plugin_GSS.c
@@ -185,7 +185,7 @@
#if UseKRB5
SharedLibraryTargetName(Csec_plugin_KRB5): Csec_plugin_KRB5.Osuf Csec_plugin_KRB5_mapper.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB5.Osuf Csec_plugin_KRB5_mapper.Osuf SecLibsKRB5 $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB5.Osuf Csec_plugin_KRB5_mapper.Osuf SecLibsKRB5 $(SHLIBREQLIBS)
Csec_plugin_KRB5.Osuf: Csec_plugin_GSS.c
$(CC) $(CFLAGS) SecAuthMechKRB5 SecIncludeDirKRB5 -o $@ -c Csec_plugin_GSS.c
@@ -196,14 +196,14 @@
#if UseKRB4
SharedLibraryTargetName(Csec_plugin_KRB4): Csec_plugin_KRB4.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB4.Osuf SecLibsKRB4 $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB4.Osuf SecLibsKRB4 $(SHLIBREQLIBS)
Csec_plugin_KRB4.Osuf: Csec_plugin_KRB4.c
$(CC) $(CFLAGS) SecIncludeDirKRB4 -o $@ -c Csec_plugin_KRB4.c
#endif
SharedLibraryTargetName(Csec_plugin_ID): Csec_plugin_ID.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_ID.Osuf $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_ID.Osuf $(SHLIBREQLIBS)
Csec_plugin_ID.Osuf: Csec_plugin_ID.c
$(CC) $(CFLAGS) -o $@ -c Csec_plugin_ID.c
diff -ur lcgdm-1.7.4.4.orig/shlib/Imakefile lcgdm-1.7.4.4/shlib/Imakefile
--- lcgdm-1.7.4.4.orig/shlib/Imakefile 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/shlib/Imakefile 2010-03-29 19:33:39.748544664 +0200
@@ -60,7 +60,7 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; case $$i in *.a) $(AR) x ../$$i; rm -f $(SYMTABNAM) ;; esac) done
- (cd tmp; ld $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
@-rm -rf tmp
liblcgdm.sl liblcgdm.so liblcgdm.dynlib: $(COMMONLIB) $(SECURITYLIB)
@@ -69,7 +69,7 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; $(AR) x ../$$i; rm -f $(SYMTABNAM)) done
- (cd tmp; ld $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
@-rm -rf tmp
libdpm.dll: $(RFIOLIB) $(NSLIB) $(DPMLIB)
diff -ur lcgdm-1.7.4.4.orig/test/srmv1/Imakefile lcgdm-1.7.4.4/test/srmv1/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv1/Imakefile 2010-03-29 16:21:46.000000000 +0200
+++ lcgdm-1.7.4.4/test/srmv1/Imakefile 2010-03-29 19:33:39.748544664 +0200
@@ -64,7 +64,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(LD) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
COMM###################### CLEANING RULES ########################
diff -ur lcgdm-1.7.4.4.orig/test/srmv2/Imakefile lcgdm-1.7.4.4/test/srmv2/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv2/Imakefile 2010-03-29 16:21:46.000000000 +0200
+++ lcgdm-1.7.4.4/test/srmv2/Imakefile 2010-03-29 19:33:39.749544441 +0200
@@ -65,7 +65,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(LD) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
COMM###################### CLEANING RULES ########################
diff -ur lcgdm-1.7.4.4.orig/test/srmv2.2/Imakefile lcgdm-1.7.4.4/test/srmv2.2/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv2.2/Imakefile 2010-03-29 16:21:46.000000000 +0200
+++ lcgdm-1.7.4.4/test/srmv2.2/Imakefile 2010-03-29 19:33:39.749544441 +0200
@@ -64,7 +64,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(LD) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
COMM###################### CLEANING RULES ########################