Windows: Cleanup .exp .res .manifest and others

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

diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile
index b58c51e..950ce77 100644 (file)
--- a/src/WINNT/client_creds/NTMakefile
+++ b/src/WINNT/client_creds/NTMakefile
@@ -7,7 +7,7 @@
 
 # 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
@@ -43,34 +43,32 @@ EXERES = \
 AFSDOBJS = \
        $(OUT)\fs_utils.obj
        
-AFSAPPLIBOBJS= \
-       $(OUT)\checklist.obj \
-       $(OUT)\al_wizard.obj \
-       $(OUT)\subclass.obj 
-
 CLIENTOBJS = \
        $(OUT)\drivemap.obj \
-    $(OUT)\RegistrySupport.obj 
+       $(OUT)\RegistrySupport.obj 
 
 VCLIBS =\
-    iphlpapi.lib \
+       iphlpapi.lib \
        comctl32.lib \
        shell32.lib \
        uuid.lib \
        ole32.lib \
        mpr.lib \
-    netapi32.lib 
+       userenv.lib \
+       netapi32.lib \
+        secur32.lib 
 
 EXELIBS = \
        $(DESTDIR)\lib\afs\afspioctl.lib \
        $(DESTDIR)\lib\libosi.lib \
-       $(DESTDIR)\lib\afs\TaLocale.lib \
-    $(DESTDIR)\lib\lanahelper.lib \
-    $(DESTDIR)\lib\afsrxkad.lib \
-    $(DESTDIR)\lib\afsdes.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
 
 ############################################################################
 #
@@ -95,9 +93,6 @@ CLIENT= ..\client_config
 $(CLIENTOBJS): $(CLIENT)\$$(@B).cpp
        $(C2OBJ) -I$(*D) $**
 
-$(AFSAPPLIBOBJS): $(AFSAPPLIB)\$$(@B).cpp
-       $(C2OBJ) -I$(*D) $**
-
 $(AFSDOBJS): $(AFSD)\$$(@B).c
        $(C2OBJ) -I$(*D) $**
 
@@ -109,9 +104,12 @@ $(EXECOBJS): $$(@B).c
 
 ############################################################################
 
-$(EXEFILE) : $(EXEOBJS) $(EXECOBJS) $(EXERES) $(AFSAPPLIBOBJS) $(AFSDOBJS) $(CLIENTOBJS) $(EXELIBS) 
+$(EXEFILE) : $(EXEOBJS) $(EXECOBJS) $(EXERES) $(AFSDOBJS) $(CLIENTOBJS) $(EXELIBS) 
        $(EXEGUILINK) $(VCLIBS)
+        $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 install : $(COPYHEADERS) $(EXEFILE) lang
 
@@ -129,6 +127,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 @$(NTLANG) %l $(MAKECMD) /nologo /f NTMakefile clean
        $(CD) ..