From: Jeffrey Altman Date: Tue, 4 Jan 2011 02:07:10 +0000 (-0500) Subject: Windows: permit clean when switching platforms X-Git-Tag: upstream/1.6.0.pre2^2~91 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=25231ef066e88ed2f84745de31771e53b1c6f120;p=packages%2Fo%2Fopenafs.git 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. Reviewed-on: http://gerrit.openafs.org/3615 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman (cherry picked from commit 605b7c3baaeb7553cb2e150f1156eba6be04c1f8) Change-Id: Ia215c34f06976dee588292fccb7396a49ab98035 Reviewed-on: http://gerrit.openafs.org/3813 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/NTMakefile b/NTMakefile index f7ef2f3ba..4b4597649 100644 --- a/NTMakefile +++ b/NTMakefile @@ -673,11 +673,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 04ff14268..42be50a97 100644 --- a/src/config/NTMakefile +++ b/src/config/NTMakefile @@ -544,12 +544,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)