Windows: Cleanup .exp .res .manifest and others

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

diff --git a/src/WINNT/afsapplib/NTMakefile b/src/WINNT/afsapplib/NTMakefile
index 8164cd6..81d3b3e 100644 (file)
--- a/src/WINNT/afsapplib/NTMakefile
+++ b/src/WINNT/afsapplib/NTMakefile
@@ -76,7 +76,7 @@ DLLOBJS = \
 VCLIBS =\
        comctl32.lib \
        rpcrt4.lib \
-       rpcns4.lib \
+#      rpcns4.lib \
 
 DLLLIBS = \
        $(DESTDIR)\lib\afs\TaAfsAdmSvrClient.lib \
@@ -84,7 +84,7 @@ DLLLIBS = \
 
 DLLFILE = $(DESTDIR)\root.server\usr\afs\bin\TaAfsAppLib.dll
 
-!IF ("$(AFSVER_CL)"<"1400")
+!IF ($(AFSVER_CL) < 1400)
 DEFFILE = TaAfsAppLib.def
 !ELSE
 DEFFILE = TaAfsAppLib2005.def
@@ -98,7 +98,8 @@ LOCALLINKFLAGS = -IGNORE:4049
 
 # AfsAppLib needs to use an explicit .DEF file to get its entry points public
 
-LOCALLINKFLAGS = $(LOCALLINKFLAGS) /DEF:$(DEFFILE)
+#LOCALLINKFLAGS = $(LOCALLINKFLAGS) /DEF:$(DEFFILE)
+LOCALLINKFLAGS = $(LOCALLINKFLAGS)
 
 # Also, AfsAppLib has a specific DLL entry-point which should be used
 
@@ -126,14 +127,17 @@ primary : headers $(DLLFILE) lang
 
 $(DLLFILE) : $(DLLOBJS) $(DLLLIBS)
        $(DLLGUILINK) $(LOCALLINKFLAGS) $(VCLIBS)
+        $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 
 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) ..