From c9486c8c9db4b7599145a0574025e8fe3135c45d Mon Sep 17 00:00:00 2001 From: Yunhua Feng Date: Wed, 26 Sep 2018 08:52:18 +0800 Subject: [PATCH] BaseTools: Update Makefile to ignore python tools make ignore make python tools, replace PYTHON_HOME by PYTHON3 Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yunhua Feng Reviewed-by: Liming Gao --- BaseTools/Makefile | 14 +++++++------- BaseTools/Source/C/Makefile | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BaseTools/Makefile b/BaseTools/Makefile index b98cd85cb7..316f725bd9 100644 --- a/BaseTools/Makefile +++ b/BaseTools/Makefile @@ -15,24 +15,24 @@ !ERROR "BASE_TOOLS_PATH is not set! Please run toolsetup.bat first!" !ENDIF -SUBDIRS = $(BASE_TOOLS_PATH)\Source\C $(BASE_TOOLS_PATH)\Source\Python +SUBDIRS = $(BASE_TOOLS_PATH)\Source\C -all: c python +all: c c : - @$(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\C + @$(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\C python: - @$(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\Python + @$(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\Python subdirs: $(SUBDIRS) - @$(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $** + @$(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $** .PHONY: clean clean: - $(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py clean $(SUBDIRS) + $(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py clean $(SUBDIRS) .PHONY: cleanall cleanall: - $(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py cleanall $(SUBDIRS) + $(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py cleanall $(SUBDIRS) diff --git a/BaseTools/Source/C/Makefile b/BaseTools/Source/C/Makefile index 1246d23afd..ac9adb287d 100644 --- a/BaseTools/Source/C/Makefile +++ b/BaseTools/Source/C/Makefile @@ -43,7 +43,7 @@ libs: $(LIBRARIES) @echo # Build libraries @echo ###################### @if not exist $(LIB_PATH) mkdir $(LIB_PATH) - @$(PYTHON_HOME)\python.exe Makefiles\NmakeSubdirs.py all $** + @$(PYTHON3) Makefiles\NmakeSubdirs.py all $** apps: $(APPLICATIONS) @echo. @@ -51,7 +51,7 @@ apps: $(APPLICATIONS) @echo # Build executables @echo ###################### @if not exist $(BIN_PATH) mkdir $(BIN_PATH) - @$(PYTHON_HOME)\python.exe Makefiles\NmakeSubdirs.py all $** + @$(PYTHON3) Makefiles\NmakeSubdirs.py all $** install: $(LIB_PATH) $(BIN_PATH) @echo. @@ -65,11 +65,11 @@ install: $(LIB_PATH) $(BIN_PATH) .PHONY: clean clean: - @$(PYTHON_HOME)\python.exe Makefiles\NmakeSubdirs.py clean $(LIBRARIES) $(APPLICATIONS) + @$(PYTHON3) Makefiles\NmakeSubdirs.py clean $(LIBRARIES) $(APPLICATIONS) .PHONY: cleanall cleanall: - @$(PYTHON_HOME)\python.exe Makefiles\NmakeSubdirs.py cleanall $(LIBRARIES) $(APPLICATIONS) + @$(PYTHON3) Makefiles\NmakeSubdirs.py cleanall $(LIBRARIES) $(APPLICATIONS) !INCLUDE Makefiles\ms.rule -- 2.39.2