From 2dc51b7c4da119de9a5dd4d7fea1fc9053eb7925 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Sun, 5 Oct 2014 09:58:31 +0200 Subject: [PATCH] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Suggested-by: Thomas Petazzoni Signed-off-by: Thomas De Schampheleire Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 15 --------------- package/pkg-utils.mk | 9 +++++++++ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a6d3bb2ba2..ec8afdd9bc 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -263,21 +263,6 @@ be selected at a time. Please fix your configuration) endif endef -################################################################################ -# check-deprecated-variable -- throw an error on deprecated variables -# -# argument 1 is the deprecated variable -# argument 2 is the new variable to use -# -# example: -# $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS)) -################################################################################ -define check-deprecated-variable -ifneq ($$(origin $(1)),undefined) -$$(error Package error: use $(2) instead of $(1). Please fix your .mk file) -endif -endef - ################################################################################ # inner-generic-package -- generates the make targets needed to build a # generic package diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 44766a062e..902531df4a 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -88,6 +88,15 @@ define sep endef +# check-deprecated-variable -- throw an error on deprecated variables +# example: +# $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS)) +define check-deprecated-variable # (deprecated var, new var) +ifneq ($$(origin $(1)),undefined) +$$(error Package error: use $(2) instead of $(1). Please fix your .mk file) +endif +endef + # # legal-info helper functions #