Переглянути джерело

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>
Peter Korsgaard 16 роки тому
батько
коміт
58508f39cc
2 змінених файлів з 2 додано та 12 видалено
  1. 0 6
      package/ncurses/Config.in
  2. 2 6
      package/ncurses/ncurses.mk

+ 0 - 6
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

+ 2 - 6
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