lbreakout2: use the new gettext logic

This commit switches to use the new gettext logic, which involves:

 - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
   on gettext/host-gettext

 - using TARGET_NLS_LIBS to force linking against libintl

 - dropping BR2_PACKAGE_GETTEXT selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-03 22:51:10 +02:00
parent 7b1b0bd0ab
commit c10979723a
2 changed files with 3 additions and 8 deletions

View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_LBREAKOUT2
bool "LBreakout2"
select BR2_PACKAGE_SDL
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
LBreakout2 is the successor to LBreakout, a breakout-style arcade
game in the manner of Arkanoid. Requires SDL, libpng, and

View File

@ -10,15 +10,11 @@ LBREAKOUT2_SITE = http://downloads.sourceforge.net/lgames/lbreakout2/$(LBREAKOUT
LBREAKOUT2_LICENSE = GPL-2.0+
LBREAKOUT2_LICENSE_FILES = COPYING
LBREAKOUT2_DEPENDENCIES = sdl libpng
LBREAKOUT2_DEPENDENCIES = sdl libpng $(TARGET_NLS_DEPENDENCIES)
LBREAKOUT2_CONF_ENV = \
SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
LBREAKOUT2_DEPENDENCIES += gettext
LBREAKOUT2_CONF_ENV += LIBS=-lintl
endif
SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
LIBS=$(TARGET_NLS_LIBS)
ifeq ($(BR2_PACKAGE_LBREAKOUT2_AUDIO),y)
LBREAKOUT2_DEPENDENCIES += sdl_mixer