From 46fa5cbfb8f4a94680dc0880db051eb8acee6a17 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 3 Jul 2012 00:07:08 +0200 Subject: Rename XXXTARGETS to xxx-package With the introduction of a specific macro for host targets, it was decided to also make the names of the macros more intuitive: generic-package, autotools-package and cmake-package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-autotargets.mk | 16 +++++++--------- package/pkg-cmaketargets.mk | 16 +++++++--------- package/pkg-gentargets.mk | 14 ++++++-------- 3 files changed, 20 insertions(+), 26 deletions(-) (limited to 'package') diff --git a/package/pkg-autotargets.mk b/package/pkg-autotargets.mk index d925cbb46..e4540509d 100644 --- a/package/pkg-autotargets.mk +++ b/package/pkg-autotargets.mk @@ -37,7 +37,7 @@ define CONFIG_UPDATE endef ################################################################################ -# AUTOTARGETS_INNER -- defines how the configuration, compilation and +# inner-autotools-package -- defines how the configuration, compilation and # installation of an autotools package should be done, implements a # few hooks to tune the build process for autotools specifities and # calls the generic package infrastructure to generate the necessary @@ -52,7 +52,7 @@ endef # argument 5 is the type (target or host) ################################################################################ -define AUTOTARGETS_INNER +define inner-autotools-package # define package-specific variables to default values ifndef $(2)_SUBDIR @@ -198,7 +198,7 @@ define AUTORECONF_HOOK fi endef -# This must be repeated from GENTARGETS_INNER, otherwise we get an empty +# This must be repeated from inner-generic-package, otherwise we get an empty # _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF # away from the non-host rule $(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool $(1),\ @@ -295,15 +295,13 @@ endif # Call the generic package infrastructure to generate the necessary # make targets -$(call GENTARGETS_INNER,$(1),$(2),$(3),$(4),$(5)) +$(call inner-generic-package,$(1),$(2),$(3),$(4),$(5)) endef ################################################################################ -# AUTOTARGETS -- the target generator macro for autotools packages -# -# Argument 1 is "target" or "host" [optional, default: "target"] +# autotools-package -- the target generator macro for autotools packages ################################################################################ -AUTOTARGETS = $(call AUTOTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) -host-autotools-package = $(call AUTOTARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) +autotools-package = $(call inner-autotools-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) +host-autotools-package = $(call inner-autotools-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) diff --git a/package/pkg-cmaketargets.mk b/package/pkg-cmaketargets.mk index 71cc61036..f9a59341a 100644 --- a/package/pkg-cmaketargets.mk +++ b/package/pkg-cmaketargets.mk @@ -21,7 +21,7 @@ ################################################################################ ################################################################################ -# CMAKETARGETS_INNER -- defines how the configuration, compilation and +# inner-cmake-package -- defines how the configuration, compilation and # installation of a CMake package should be done, implements a few hooks to # tune the build process and calls the generic package infrastructure to # generate the necessary make targets @@ -35,7 +35,7 @@ # argument 5 is the type (target or host) ################################################################################ -define CMAKETARGETS_INNER +define inner-cmake-package # define package-specific variables to default values ifndef $(2)_SUBDIR @@ -96,7 +96,7 @@ endef endif endif -# This must be repeated from GENTARGETS_INNER, otherwise we only get +# This must be repeated from inner-generic-package, otherwise we only get # host-cmake in _DEPENDENCIES because of the following line $(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) @@ -180,18 +180,16 @@ endif # Call the generic package infrastructure to generate the necessary # make targets -$(call GENTARGETS_INNER,$(1),$(2),$(3),$(4),$(5)) +$(call inner-generic-package,$(1),$(2),$(3),$(4),$(5)) endef ################################################################################ -# CMAKETARGETS -- the target generator macro for CMake packages -# -# Argument 1 is "target" or "host" [optional, default: "target"] +# cmake-package -- the target generator macro for CMake packages ################################################################################ -CMAKETARGETS = $(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) -host-cmake-package = $(call CMAKETARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) +cmake-package = $(call inner-cmake-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) +host-cmake-package = $(call inner-cmake-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) ################################################################################ # Generation of the CMake toolchain file diff --git a/package/pkg-gentargets.mk b/package/pkg-gentargets.mk index a9cee9099..c01440e64 100644 --- a/package/pkg-gentargets.mk +++ b/package/pkg-gentargets.mk @@ -157,7 +157,7 @@ $(BUILD_DIR)/%/.stamp_dircleaned: rm -Rf $(@D) ################################################################################ -# GENTARGETS_INNER -- generates the make targets needed to build a +# inner-generic-package -- generates the make targets needed to build a # generic package # # argument 1 is the lowercase package name @@ -169,7 +169,7 @@ $(BUILD_DIR)/%/.stamp_dircleaned: # argument 5 is the type (target or host) ################################################################################ -define GENTARGETS_INNER +define inner-generic-package # Define default values for various package-related variables, if not # already defined. For some variables (version, source, site and @@ -496,17 +496,15 @@ endif # SITE_METHOD DL_TOOLS_DEPENDENCIES += $(firstword $(INFLATE$(suffix $($(2)_SOURCE)))) endif # $(2)_KCONFIG_VAR -endef # GENTARGETS_INNER +endef # inner-generic-package ################################################################################ -# GENTARGETS -- the target generator macro for generic packages -# -# Argument 1 is "target" or "host" [optional, default: "target"] +# generic-package -- the target generator macro for generic packages ################################################################################ # In the case of target packages, keep the package name "pkg" -GENTARGETS = $(call GENTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) +generic-package = $(call inner-generic-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) # In the case of host packages, turn the package name "pkg" into "host-pkg" -host-generic-package = $(call GENTARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) +host-generic-package = $(call inner-generic-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) # :mode=makefile: -- cgit v1.2.3