DEVEL15-windows-custom-control-subclassing-bis-20061212

Do not link to both talocale.lib and taafsapplib.lib.

If you do, then there are duplicate functions in both the .EXE and
the TaAfsAppLib.DLL.

(cherry picked from commit 04daebb95ebc15ece05f6f42aec1a3a7e9bd1bbf)

diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile
index a7a0696..1cb08c3 100644 (file)
--- a/src/WINNT/client_config/NTMakefile
+++ b/src/WINNT/client_config/NTMakefile
@@ -58,7 +58,6 @@ VCLIBS =\
     netapi32.lib
 
 EXELIBS = \
-       $(DESTDIR)\lib\afs\TaLocale.lib \
        $(DESTDIR)\lib\afs\TaAfsAppLib.lib \
        $(DESTDIR)\lib\afsrpc.lib \
        $(DESTDIR)\lib\afsauthent.lib \
@@ -87,21 +86,8 @@ COPYHEADERS = \
        $(DESTDIR)\include\WINNT\resize.h \
        $(DESTDIR)\include\WINNT\subclass.h
 
-AFSAPPLIBOBJS= \
-       $(OUT)\hashlist.obj \
-       $(OUT)\resize.obj \
-       $(OUT)\subclass.obj \
-       $(OUT)\fastlist.obj \
-       $(OUT)\dialog.obj \
-       $(OUT)\ctl_sockaddr.obj \
-       $(OUT)\ctl_spinner.obj \
-       $(OUT)\checklist.obj
-
 AFSAPPLIB=..\afsapplib
 
-$(AFSAPPLIBOBJS): $(AFSAPPLIB)\$$(@B).cpp
-       $(C2OBJ) -I$(AFSAPPLIB) $**
-
 $(AFSDOBJS): $(AFSD)\$$(@B).c
        $(C2OBJ) -I$(AFSD) $**
 

diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile
index 40f7abe..3721279 100644 (file)
--- a/src/WINNT/client_creds/NTMakefile
+++ b/src/WINNT/client_creds/NTMakefile
@@ -60,7 +60,6 @@ VCLIBS =\
 EXELIBS = \
        $(DESTDIR)\lib\afs\afspioctl.lib \
        $(DESTDIR)\lib\libosi.lib \
-       $(DESTDIR)\lib\afs\TaLocale.lib \
        $(DESTDIR)\lib\afs\TaAfsAppLib.lib \
        $(DESTDIR)\lib\lanahelper.lib \
        $(DESTDIR)\lib\afsrxkad.lib \