From 006260b8b0794b20ce83e466bae23518249f1d6f Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Wed, 2 Feb 2011 19:24:00 -0500 Subject: [PATCH] Windows: remove duplicate advapi32.lib references advapi32.lib is included in the conlibsdll macro. No need to include it in the link list twice. Reviewed-on: http://gerrit.openafs.org/3882 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman (cherry picked from commit 15c497e90edc69312dba6843521ff08f0ac19248) Change-Id: Ibcd82014ca28e8ba0bec6e184bc5ae276a0eea90 Reviewed-on: http://gerrit.openafs.org/3914 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/config/NTMakefile.amd64_w2k | 4 ++-- src/config/NTMakefile.i386_nt40 | 4 ++-- src/config/NTMakefile.i386_w2k | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 110b51a5a..2e2da3ef9 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -507,7 +507,7 @@ DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -q $@ !ENDIF #CHECKED BUILD # EXE link macro for console applications -EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $** +EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib version.lib $** # EXE link macro for GUI applications EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) $** @@ -521,7 +521,7 @@ DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) $ # DLL link macro for GUI applications DLLGUILINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(guilibsdll) $** -EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $** +EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib version.lib $** DLLMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfcdlllflags) $(afslflags) $(mfclibsdll) $** diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index 011390558..644769818 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -467,7 +467,7 @@ DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -q $@ # EXE link macro for console applications -EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $** +EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib version.lib $** # EXE link macro for GUI applications EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) $** @@ -480,7 +480,7 @@ DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) $ # DLL link macro for GUI applications DLLGUILINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(guilibsdll) $** -EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $** +EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib version.lib $** DLLMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfcdlllflags) $(afslflags) $(mfclibsdll) $** # DLL link macro for resource-only DLLs diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index b646d4da7..03be7252e 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -513,7 +513,7 @@ DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -q $@ # EXE link macro for console applications -EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $** +EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib version.lib $** # EXE link macro for GUI applications EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) $** @@ -526,7 +526,7 @@ DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) $ # DLL link macro for GUI applications DLLGUILINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(guilibsdll) $** -EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $** +EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib version.lib $** DLLMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfcdlllflags) $(afslflags) $(mfclibsdll) $** # DLL link macro for resource-only DLLs -- 2.39.5