From cc1cd3b267212c0e932db4855ff7c1afe0b45e67 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Mon, 12 Nov 2012 10:08:29 +0000 Subject: [PATCH] legacy: move old GENTARGETS macros to Makefile.legacy Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Makefile.legacy | 7 +++++++ package/Makefile.in | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.legacy b/Makefile.legacy index 2e015a1e3..c8b568d75 100644 --- a/Makefile.legacy +++ b/Makefile.legacy @@ -11,3 +11,10 @@ ifeq ($(BR2_LEGACY),y) $(error "You have legacy configuration in your .config! Please check your configuration.") endif + +# +# Legacy options from 2012.05 +# +GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package))) +AUTOTARGETS = $$(error The AUTOTARGETS macro no longer exists; use $$$$(eval $$$$(autotools-package)) or $$$$(eval $$$$(host-autotools-package))) +CMAKETARGETS = $$(error The CMAKETARGETS macro no longer exists; use $$$$(eval $$$$(cmake-package)) or $$$$(eval $$$$(host-cmake-package))) diff --git a/package/Makefile.in b/package/Makefile.in index 9fdc74599..2dd81c72c 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -305,12 +305,6 @@ else SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared endif -# Warn if a package uses the deprecated GENTARGETS macros. This can be -# removed again for BR-2012.11. -GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package))) -AUTOTARGETS = $$(error The AUTOTARGETS macro no longer exists; use $$$$(eval $$$$(autotools-package)) or $$$$(eval $$$$(host-autotools-package))) -CMAKETARGETS = $$(error The CMAKETARGETS macro no longer exists; use $$$$(eval $$$$(cmake-package)) or $$$$(eval $$$$(host-cmake-package))) - include package/pkg-utils.mk include package/pkg-download.mk include package/pkg-autotools.mk