From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Wed, 27 Feb 2013 20:19:41 +0000 (-0500)
Subject: Windows: afsio reduce library link list
X-Git-Tag: upstream/1.8.0_pre1^2~1389
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9d4f7ca48cf1f553bbb566e715fe986627a5d47f;p=packages%2Fo%2Fopenafs.git

Windows: afsio reduce library link list

When linking afsio many of the libraries specified in the EXELIB3
list were unnecessary.  The only lib in the list that is required
is libcmd.lib.  Rename EXELIB3 to LIBCMD and prune the rest.

Change-Id: I87bf0583f312d7b3dadc5581c08fedaa6b754c77
Reviewed-on: http://gerrit.openafs.org/9301
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index 4aff92597..1c7bb0a6f 100644
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -439,12 +439,7 @@ EXELIBS2 = \
 	$(DESTDIR)\lib\afshcrypto.lib \
 	$(DESTDIR)\lib\afsroken.lib
 
-EXELIBS3 = \
-	$(DESTDIR)\lib\afs\afscmd.lib \
-	$(DESTDIR)\lib\afsrxkad.lib \
-	$(DESTDIR)\lib\opr.lib \
-	$(DESTDIR)\lib\afshcrypto.lib \
-	$(DESTDIR)\lib\afsroken.lib
+LIBCMD = $(DESTDIR)\lib\afs\afscmd.lib
 
 # klog.exe
 $(EXEDIR)\klog.exe: $(OUT)\cklog.obj $(OUT)\klog.res $(DESTDIR)\lib\krbcompat_delayload.obj $(EXELIBS) $(HEIMDEPS)
@@ -546,7 +541,7 @@ KFWLIBS = \
 LINKOPTS = /DELAYLOAD:krbv4w32.dll /DELAYLOAD:krb5_32.dll /DELAYLOAD:comerr32.dll
 !endif
 
-$(EXEDIR)\afsio.exe: $(AFSIOOBJS) $(OUT)\afsio.res $(RXOBJS) $(AFSD_EXELIBS) $(EXELIBS3) $(AFSCPLIB)
+$(EXEDIR)\afsio.exe: $(AFSIOOBJS) $(OUT)\afsio.res $(RXOBJS) $(AFSD_EXELIBS) $(LIBCMD) $(AFSCPLIB)
 	$(EXECONLINK) $(KFWLIBS) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib rpcrt4.lib
         $(_VC_MANIFEST_EMBED_EXE)
 	$(EXEPREP)