From fd165e1580805c37dc7f68189b7c102d9b8e8b83 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 7 Jul 2022 19:06:37 +0200 Subject: [PATCH] - rename TARGET_MAKE => TARGET_MAKE_BUILD; HOST_MAKE => HOST_MAKE_BUILD --- package/pkg-autotools.mk | 4 ++-- package/pkg-cmake.mk | 4 ++-- package/pkg-generic.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 31175431..986912d0 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -95,7 +95,7 @@ define autotools-package $(eval PKG_MODE = $(pkg-mode)) $(call PREPARE,$(1)) $(call TARGET_CONFIGURE) - $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call TARGET_MAKE)) + $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call TARGET_MAKE_BUILD)) $(if $(filter $(1),$(PKG_NO_INSTALL)),,$(call TARGET_MAKE_INSTALL)) $(call TARGET_FOLLOWUP) endef @@ -152,7 +152,7 @@ define host-autotools-package $(eval PKG_MODE = $(pkg-mode)) $(call PREPARE,$(1)) $(call HOST_CONFIGURE) - $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call HOST_MAKE)) + $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call HOST_MAKE_BUILD)) $(if $(filter $(1),$(PKG_NO_INSTALL)),,$(call HOST_MAKE_INSTALL)) $(call HOST_FOLLOWUP) endef diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 49ea319a..2de9828d 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -65,7 +65,7 @@ define cmake-package $(eval PKG_MODE = $(pkg-mode)) $(call PREPARE,$(1)) $(call TARGET_CMAKE) - $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call TARGET_MAKE)) + $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call TARGET_MAKE_BUILD)) $(if $(filter $(1),$(PKG_NO_INSTALL)),,$(call TARGET_MAKE_INSTALL)) $(call TARGET_FOLLOWUP) endef @@ -112,7 +112,7 @@ define host-cmake-package $(eval PKG_MODE = $(pkg-mode)) $(call PREPARE,$(1)) $(call HOST_CMAKE) - $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call HOST_MAKE)) + $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call HOST_MAKE_BUILD)) $(if $(filter $(1),$(PKG_NO_INSTALL)),,$(call HOST_MAKE_INSTALL)) $(call HOST_FOLLOWUP) endef diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a8a723b6..1f0cee45 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -13,7 +13,7 @@ define TARGET_MAKE_CMDS $($(PKG)_MAKE_OPTS) endef -define TARGET_MAKE +define TARGET_MAKE_BUILD @$(call MESSAGE,"Building") $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_BUILD_CMDS) @@ -39,7 +39,7 @@ endef define generic-package $(eval PKG_MODE = $(pkg-mode)) $(call PREPARE,$(1)) - $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call TARGET_MAKE)) + $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call TARGET_MAKE_BUILD)) $(if $(filter $(1),$(PKG_NO_INSTALL)),,$(call TARGET_MAKE_INSTALL)) $(call TARGET_FOLLOWUP) endef @@ -55,7 +55,7 @@ define HOST_MAKE_CMDS $($(PKG)_MAKE_OPTS) endef -define HOST_MAKE +define HOST_MAKE_BUILD @$(call MESSAGE,"Compiling") $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)$(call $(PKG)_BUILD_CMDS) @@ -81,7 +81,7 @@ endef define host-generic-package $(eval PKG_MODE = $(pkg-mode)) $(call PREPARE,$(1)) - $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call HOST_MAKE)) + $(if $(filter $(1),$(PKG_NO_BUILD)),,$(call HOST_MAKE_BUILD)) $(if $(filter $(1),$(PKG_NO_INSTALL)),,$(call HOST_MAKE_INSTALL)) $(call HOST_FOLLOWUP) endef