Windows: permit clean when switching platforms

When switching between i386 and amd64 in the same build tree
the "clean" make directive would fail due to NTLang.bat not
having been built in the new platform's destination directory.
Force NTLang.bat to be built as a dependency of cleanup and
delete it at the end along with the version files.

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

diff --git a/NTMakefile b/NTMakefile
index 88102c4..9222668 100644 (file)
--- a/NTMakefile
+++ b/NTMakefile
@@ -701,11 +701,11 @@ install: finale
 # Clean target for obj tree
 clean:
        $(CD) $(SRC)\config
-       nmake /nologo /f ntmakefile version
+       nmake /nologo /f ntmakefile version langsetup
        $(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
+       nmake /nologo /f ntmakefile clean_final
        $(CD) ..\..
 
 # Language-only build target

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index c34f811..4043fd5 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -550,12 +550,11 @@ langsetup: $(DESTDIR)\bin\NTLang.bat
 
 install: idirs $(INCFILES) $(INCTOOLS) $(INCCOPY) version $(DESTDIR)\NTDllmap.txt langsetup
 
-install9x: install
-
 # This clean target must be named something different than the universal
-# 'clean' so that the version file can be removed last.
-clean_version:
+# 'clean' so that the version and NTLang.bat files can be removed last.
+clean_final:
        -$(DEL) NTMakefile.version
+        -$(DEL) $(DESTDIR)\bin\NTLang.bat
 
 clean::
         -$(DEL) $(INCFILES)