pkg-utils.mk: fix/clean indentation

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Samuel Martin 2012-07-22 15:28:33 +02:00 committed by Thomas Petazzoni
parent ff2ee34086
commit 736ce2f3da

View file

@ -17,11 +17,11 @@
[TO] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _ [TO] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _
UPPERCASE = $(strip $(eval __tmp := $1) \ UPPERCASE = $(strip $(eval __tmp := $1) \
$(foreach c, $(join $(addsuffix :,$([FROM])),$([TO])), \ $(foreach c, $(join $(addsuffix :,$([FROM])),$([TO])), \
$(eval __tmp := \ $(eval __tmp := \
$(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),\ $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),\
$(__tmp)))) \ $(__tmp)))) \
$(__tmp)) $(__tmp))
# #
# Manipulation of .config files based on the Kconfig # Manipulation of .config files based on the Kconfig
@ -30,18 +30,18 @@ UPPERCASE = $(strip $(eval __tmp := $1) \
# #
define KCONFIG_ENABLE_OPT define KCONFIG_ENABLE_OPT
$(SED) "/\\<$(1)\\>/d" $(2) $(SED) "/\\<$(1)\\>/d" $(2)
echo "$(1)=y" >> $(2) echo "$(1)=y" >> $(2)
endef endef
define KCONFIG_SET_OPT define KCONFIG_SET_OPT
$(SED) "/\\<$(1)\\>/d" $(3) $(SED) "/\\<$(1)\\>/d" $(3)
echo "$(1)=$(2)" >> $(3) echo "$(1)=$(2)" >> $(3)
endef endef
define KCONFIG_DISABLE_OPT define KCONFIG_DISABLE_OPT
$(SED) "/\\<$(1)\\>/d" $(2) $(SED) "/\\<$(1)\\>/d" $(2)
echo "# $(1) is not set" >> $(2) echo "# $(1) is not set" >> $(2)
endef endef
# Helper functions to determine the name of a package and its # Helper functions to determine the name of a package and its
@ -50,17 +50,9 @@ endef
# automagically find where the package is located. Note that the # automagically find where the package is located. Note that the
# pkgdir macro is carefully written to handle the case of the Linux # pkgdir macro is carefully written to handle the case of the Linux
# package, for which the package directory is an empty string. # package, for which the package directory is an empty string.
define pkgdir pkgdir = $(dir $(lastword $(MAKEFILE_LIST)))
$(dir $(lastword $(MAKEFILE_LIST))) pkgname = $(lastword $(subst /, ,$(call pkgdir)))
endef pkgparentdir = $(patsubst %$(call pkgname)/,%,$(call pkgdir))
define pkgname
$(lastword $(subst /, ,$(call pkgdir)))
endef
define pkgparentdir
$(patsubst %$(call pkgname)/,%,$(call pkgdir))
endef
# Define extractors for different archive suffixes # Define extractors for different archive suffixes
INFLATE.bz2 = $(BZCAT) INFLATE.bz2 = $(BZCAT)
@ -72,15 +64,15 @@ INFLATE.xz = $(XZCAT)
INFLATE.tar = cat INFLATE.tar = cat
# MESSAGE Macro -- display a message in bold type # MESSAGE Macro -- display a message in bold type
MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)" MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
TERM_BOLD := $(shell tput smso) TERM_BOLD := $(shell tput smso)
TERM_RESET := $(shell tput rmso) TERM_RESET := $(shell tput rmso)
# Utility functions for 'find' # Utility functions for 'find'
# findfileclauses(filelist) => -name 'X' -o -name 'Y' # findfileclauses(filelist) => -name 'X' -o -name 'Y'
findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1))) findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1)))
# finddirclauses(base, dirlist) => -path 'base/dirX' -o -path 'base/dirY' # finddirclauses(base, dirlist) => -path 'base/dirX' -o -path 'base/dirY'
finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2))) finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
# Miscellaneous utility functions # Miscellaneous utility functions
# notfirstword(wordlist): returns all but the first word in wordlist # notfirstword(wordlist): returns all but the first word in wordlist