diff options
| author | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2012-07-03 00:07:08 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-07-17 20:22:41 +0200 |
| commit | 46fa5cbfb8f4a94680dc0880db051eb8acee6a17 (patch) | |
| tree | a3df3b12a820f82953d8ae86397ef4fd939b94c1 /package/pkg-cmaketargets.mk | |
| parent | 69e64c42b7f325e6e21d063644eea51204321539 (diff) | |
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) <arnout@mind.be>
Diffstat (limited to 'package/pkg-cmaketargets.mk')
| -rw-r--r-- | package/pkg-cmaketargets.mk | 16 |
1 files changed, 7 insertions, 9 deletions
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 |