From 43fa88ae90f7c8684456ff931dc0e57efbb5e3f4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 14 Dec 2014 17:04:38 +0100 Subject: [PATCH] package/ncurses: slight code re-arrangement Move the definition of libraries to install before it is actually used. Also, in a coming changeset, it will also be used to know which pkg-config files to symlink. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/ncurses/ncurses.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index ec64663afd..b870aa4972 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -43,6 +43,11 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y) NCURSES_CONF_OPTS += --with-shared --with-normal endif +NCURSES_LIBS-y = libncurses +NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_MENU) += libmenu +NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_PANEL) += libpanel +NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += libform + ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) NCURSES_CONF_OPTS += --enable-widec NCURSES_LIB_SUFFIX = w @@ -76,11 +81,6 @@ NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_LIBS endif -NCURSES_LIBS-y = libncurses -NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_MENU) += libmenu -NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_PANEL) += libpanel -NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += libform - ifneq ($(BR2_ENABLE_DEBUG),y) NCURSES_CONF_OPTS += --without-debug endif -- 2.30.2