ncurses: remove dedicated target-headers option

Instead, simply only copy headers/static lib if BR2_HAVE_DEVFILES
is enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in
index bfbd139734c39a24ef8c2c091c673a01c19241a4..d80f5733d4af3e1c002ec6b318176170bfc90402 100644 (file)
--- a/package/ncurses/Config.in
+++ b/package/ncurses/Config.in
@@ -23,9 +23,3 @@ config BR2_PACKAGE_NCURSES_TARGET_MENU
        depends on BR2_PACKAGE_NCURSES
        help
          Includes ncurses dynamic libmenu in target
-
-config BR2_PACKAGE_NCURSES_TARGET_HEADERS
-       bool "ncurses headers in target"
-       depends on BR2_PACKAGE_NCURSES
-       help
-         Ncurses headers in target

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index da2230a79cb06eefce9c49e7fa7a1e8486b339f2..2c7bf79d2496f24f633675a578895ab5b5555b5b 100644 (file)
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -152,12 +152,11 @@ $(TARGET_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.a
        -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
        touch -c $@
 
-ncurses: $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
+ncurses: $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION) \
+       $(if $(BR2_HAVE_DEVFILES),$(TARGET_DIR)/usr/lib/libncurses.a)
 
 ncurses-unpacked: $(NCURSES_DIR)/.patched
 
-ncurses-headers: $(TARGET_DIR)/usr/lib/libncurses.a
-
 ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
 
 ncurses-clean:
@@ -178,6 +177,3 @@ ncurses-dirclean:
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 TARGETS+=ncurses
 endif
-ifeq ($(BR2_PACKAGE_NCURSES_TARGET_HEADERS),y)
-TARGETS+=ncurses-headers
-endif