Windows: improve afskfw error message output

[openafs.git] / src / WINNT / client_creds / NTMakefile

diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile
index 40f7abe..ca9ff93 100644 (file)
--- a/src/WINNT/client_creds/NTMakefile
+++ b/src/WINNT/client_creds/NTMakefile
@@ -1,13 +1,13 @@
 # Copyright 2000, International Business Machines Corporation and others.
 # All Rights Reserved.
-# 
+#
 # This software has been released under the terms of the IBM Public
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
 # include the AFSD source tree on our inclusion path
 
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) /D"_AFXDLL" -I..\afsd -I..\client_config -I..\kfw\inc\krb5 
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) /D"_AFXDLL" -I..\afsd -I..\client_config -I..\kfw\inc\krb5 -DUAC_COMPATIBLE=1
 
 # include the primary makefile
 RELDIR=WINNT\client_creds
@@ -41,11 +41,12 @@ EXERES = \
        $(OUT)\afscreds_stub.res
 
 AFSDOBJS = \
-       $(OUT)\fs_utils.obj
-       
+       $(OUT)\fs_utils.obj \
+        $(OUT)\cm_nls.obj
+
 CLIENTOBJS = \
        $(OUT)\drivemap.obj \
-       $(OUT)\RegistrySupport.obj 
+       $(OUT)\RegistrySupport.obj
 
 VCLIBS =\
        iphlpapi.lib \
@@ -55,19 +56,23 @@ VCLIBS =\
        ole32.lib \
        mpr.lib \
        userenv.lib \
-       netapi32.lib 
+       netapi32.lib \
+        secur32.lib
 
 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 \
-       $(DESTDIR)\lib\afsdes.lib \
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\libafsconf.lib \
-       $(DESTDIR)\lib\afskfw.lib
+       $(DESTDIR)\lib\afs\afsreg.lib \
+        $(DESTDIR)\lib\afskfw.lib \
+        $(DESTDIR)\lib\afs\afscom_err.lib \
+        $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\afsroken.lib
+
 
 ############################################################################
 #
@@ -93,7 +98,7 @@ $(CLIENTOBJS): $(CLIENT)\$$(@B).cpp
        $(C2OBJ) -I$(*D) $**
 
 $(AFSDOBJS): $(AFSD)\$$(@B).c
-       $(C2OBJ) -I$(*D) $**
+       $(C2OBJ) -I$(*D) -I$(DESTDIR)\include\rx $**
 
 $(EXEOBJS): $$(@B).cpp
        $(C2OBJ) -I$(*D) -I$(AFSAPPLIB) $**
@@ -103,10 +108,12 @@ $(EXECOBJS): $$(@B).c
 
 ############################################################################
 
-$(EXEFILE) : $(EXEOBJS) $(EXECOBJS) $(EXERES) $(AFSDOBJS) $(CLIENTOBJS) $(EXELIBS) 
+$(EXEFILE) : $(EXEOBJS) $(EXECOBJS) $(EXERES) $(AFSDOBJS) $(CLIENTOBJS) $(EXELIBS)
        $(EXEGUILINK) $(VCLIBS)
         $(_VC_MANIFEST_EMBED_EXE)
-       $(EXEPREP) 
+       $(EXEPREP)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 install : $(COPYHEADERS) $(EXEFILE) lang
 
@@ -125,7 +132,7 @@ $(OUT)\afscreds_stub.res : afscreds_stub.rc AFS_component_version_number.h
 clean::
        $(CD) lang
         @if exist AFS_component_version_number.h del AFS_component_version_number.h
-       for /f %l in ('dir /B ??_??') do ( if exist @$(NTLANG) do @$(NTLANG) %l $(MAKECMD) /nologo /f NTMakefile clean )
+       for /f %l in ('dir /B ??_??') do @$(NTLANG) %l $(MAKECMD) /nologo /f NTMakefile clean
        $(CD) ..
 
 mkdir: