From 24ff8eb0dd64d2fe948899a7273293b0eb79600c Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 5 Jun 2010 19:29:59 -0400 Subject: [PATCH] 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 Tested-by: Jeffrey Altman --- NTMakefile | 4 +++- src/WINNT/afsapplib/NTMakefile | 2 +- src/WINNT/afssvrcfg/NTMakefile | 2 +- src/WINNT/afssvrcpa/NTMakefile | 2 +- src/WINNT/afssvrmgr/NTMakefile | 2 +- src/WINNT/afsusrmgr/NTMakefile | 2 +- src/WINNT/client_creds/NTMakefile | 2 +- src/config/NTMakefile.amd64_w2k | 2 +- src/config/NTMakefile.i386_nt40 | 2 +- src/config/NTMakefile.i386_w2k | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/NTMakefile b/NTMakefile index 36872bea3a..54c818b11c 100644 --- 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 d9835b1b13..81d3b3ebc0 100644 --- 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 3472275cc8..81c6e0a559 100644 --- 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 cbbdba4abb..b8bd383b0f 100644 --- 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 a6c7e735f1..6c8372776f 100644 --- 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 068adffc55..5cc3cd262e 100644 --- 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 ce1017e681..950ce778b9 100644 --- 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 baa9a0bb0c..08da06d9bb 100644 --- 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 ece4a45e58..64fd0ffc0a 100644 --- 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 d570066636..ec9957f073 100644 --- 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.