jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows: permit clean when switching platforms

Browse Source 
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 <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit 605b7c3baa)

Change-Id: Ia215c34f06976dee588292fccb7396a49ab98035
Reviewed-on: http://gerrit.openafs.org/3813
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Jeffrey Altman 2011-01-03 21:07:10 -05:00 committed by Derrick Brashear
parent c6893df719
commit 25231ef066
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NTMakefile
View File

@ -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

7
src/config/NTMakefile
View File

@ -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)