Windows: Cleanup .exp .res .manifest and others

Fix the cleanup procedure to work when the tree has not previously
been built.

Delete .exp, .res, and .manifest files from the $(OBJ) tree.

Perform cleanup on all language directories.

Change-Id: I2a24c69293066f012cb869fe67dbacb5ffdc2d43
Reviewed-on: http://gerrit.openafs.org/2087
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/NTMakefile b/NTMakefile
index 36872bea3a4746ece3285b3db6edaa7e3921b67a..54c818b11c05e1eee8a99a645b89a853c87bad7a 100644 (file)
--- a/NTMakefile
+++ b/NTMakefile
@@ -643,7 +643,9 @@ install: finale
 
 # Clean target for obj tree
 clean:
-       nmake /nologo /f ntmakefile "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" "NTMAKE_OBJS = nmake /nologo /f ntmakefile clean" install
+       $(CD) $(SRC)\config
+       nmake /nologo /f ntmakefile version
+       $(CD) ..\..
        nmake /nologo /f ntmakefile "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" "NTMAKE_OBJS = nmake /nologo /f ntmakefile clean" media
        $(CD) $(SRC)\config
        nmake /nologo /f ntmakefile clean_version

diff --git a/src/WINNT/afsapplib/NTMakefile b/src/WINNT/afsapplib/NTMakefile
index d9835b1b139ddedb31ce31b21943e88a2647825e..81d3b3ebc01548b47102cb3cfb440e32594d084a 100644 (file)
--- a/src/WINNT/afsapplib/NTMakefile
+++ b/src/WINNT/afsapplib/NTMakefile
@@ -137,7 +137,7 @@ $(DLLFILE) : $(DLLOBJS) $(DLLLIBS)
 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) ..
 
 

diff --git a/src/WINNT/afssvrcfg/NTMakefile b/src/WINNT/afssvrcfg/NTMakefile
index 3472275cc8ccb7f51657e92a546b47a675bb6f17..81c6e0a559555afe26e51595478fe37f64bd44b2 100644 (file)
--- a/src/WINNT/afssvrcfg/NTMakefile
+++ b/src/WINNT/afssvrcfg/NTMakefile
@@ -95,7 +95,7 @@ lang::
 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:

diff --git a/src/WINNT/afssvrcpa/NTMakefile b/src/WINNT/afssvrcpa/NTMakefile
index cbbdba4abb183d83af21c52079993aed547432b6..b8bd383b0fae632eb1dfae36d50d83db3a648db5 100644 (file)
--- a/src/WINNT/afssvrcpa/NTMakefile
+++ b/src/WINNT/afssvrcpa/NTMakefile
@@ -60,7 +60,7 @@ lang::
 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:

diff --git a/src/WINNT/afssvrmgr/NTMakefile b/src/WINNT/afssvrmgr/NTMakefile
index a6c7e735f1a90c814e9c3c0474a3150d53bfab54..6c8372776fa3a4c2179257915f917144ac5a4310 100644 (file)
--- a/src/WINNT/afssvrmgr/NTMakefile
+++ b/src/WINNT/afssvrmgr/NTMakefile
@@ -128,7 +128,7 @@ $(OUT)\svrmgr_stub.res : 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:

diff --git a/src/WINNT/afsusrmgr/NTMakefile b/src/WINNT/afsusrmgr/NTMakefile
index 068adffc5514259a82d5999a86b6e12452817359..5cc3cd262e161d1723d1553da19396eba5f4f59c 100644 (file)
--- a/src/WINNT/afsusrmgr/NTMakefile
+++ b/src/WINNT/afsusrmgr/NTMakefile
@@ -99,7 +99,7 @@ $(OUT)\AfsUsrMgr_stub.res : 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:

diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile
index ce1017e6813617a127cbc285febd6c5a16d370b4..950ce778b97dbd429aecd991134438df91a91280 100644 (file)
--- a/src/WINNT/client_creds/NTMakefile
+++ b/src/WINNT/client_creds/NTMakefile
@@ -128,7 +128,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:

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index baa9a0bb0ccad3e112f9a8f05aff6382066a900c..08da06d9bb40b8731888a3c0c20283c2527af9ce 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -220,7 +220,7 @@ RXGEN = $(DESTDIR)\bin\rxgen
 
 # Common clean target.
 clean::
-       $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb
+       $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb $(OUT)\*.res $(OUT)\*.manifest $(OUT)\*.exp
        $(DEL) /q $(OUT)\*_component_version_number.* *_component_version_number.*
 
 # Common lang target.

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index ece4a45e58255350c15374bfef80aba6fa9b2913..64fd0ffc0a674bf905f6393fce55b63a216ac866 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -226,7 +226,7 @@ RXGEN = $(DESTDIR)\bin\rxgen
 
 # Common clean target.
 clean::
-       $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb
+       $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb $(OUT)\*.res $(OUT)\*.manifest $(OUT)\*.exp
        $(DEL) /q $(OUT)\*_component_version_number.* *_component_version_number.*
 
 # Common lang target.

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index d570066636f634b307e008afaf71087961572ec8..ec9957f073f9091e6097a1402ff850ceaecdf7d7 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -230,7 +230,7 @@ RXGEN = $(DESTDIR)\bin\rxgen
 
 # Common clean target.
 clean::
-       $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb
+       $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb $(OUT)\*.res $(OUT)\*.manifest $(OUT)\*.exp
        $(DEL) /q $(OUT)\*_component_version_number.* *_component_version_number.*
 
 # Common lang target.