readline: remove BR2_PACKAGE_READLINE_TARGET configuration option

Other packages don't have this, and several packages are depending on
readline where they actually want readline-target instead.

diff --git a/package/database/sqlite/sqlite.mk b/package/database/sqlite/sqlite.mk
index cd0169bfe182ef119ae9cb287a2427cd4f933f63..ff1d4d25beb8c89dbb2762dfb20e7cdd46b87f72 100644 (file)
--- a/package/database/sqlite/sqlite.mk
+++ b/package/database/sqlite/sqlite.mk
@@ -55,7 +55,7 @@ $(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
        cp -dpf $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
        $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so
 
-sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3
+sqlite: uclibc ncurses $(TARGET_DIR)/usr/bin/sqlite3
 
 sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
 

diff --git a/package/python/python.mk b/package/python/python.mk
index 3173ad0c42d52d4a822947ccc4d2284ae1a8b6b4..6c85b1f8898d10ef7f848bcc40498218e3321ffc 100644 (file)
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -17,7 +17,7 @@ PYTHON_SITE_PACKAGE_DIR=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site
 BR2_PYTHON_DISABLED_MODULES=dbm zipfile
 
 ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y)
-PYTHON_DEPS += readline-target
+PYTHON_DEPS += readline
 else
 BR2_PYTHON_DISABLED_MODULES += readline
 endif

diff --git a/package/readline/Config.in b/package/readline/Config.in
index 4234e2ebdf503267192e6acfcd6ea78c9e2bbc4e..9ab61abc1103ee132dc5b85975d0df209e2547d9 100644 (file)
--- a/package/readline/Config.in
+++ b/package/readline/Config.in
@@ -3,9 +3,3 @@ config BR2_READLINE
        bool "readline"
        help
            Enable GNU readline support?
-
-config BR2_PACKAGE_READLINE_TARGET
-       bool "readline for the target"
-       depends on BR2_READLINE
-       help
-         Say yes here to install the readline libraries on the target.

diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 910b0415095f5813d8d1be4f55f2bd0742015c01..44b1a01b03d0ce5ce43b35a2ff51fce8fa5645e1 100644 (file)
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -76,23 +76,16 @@ $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY): $(READLINE_DIR)/$(READLINE_BINAR
        chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
        $(STRIPCMD) $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
 
-readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h
+readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
 
 readline-clean:
-       $(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall
+       -$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall
+       -$(MAKE) -C $(READLINE_DIR) DESTDIR=$(TARGET_DIR) uninstall
        -$(MAKE) -C $(READLINE_DIR) clean
 
 readline-dirclean:
        rm -rf $(READLINE_DIR)
 
-readline-target: readline $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
-
-readline-target-clean:
-       -$(MAKE) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
-
 ifeq ($(BR2_READLINE),y)
 TARGETS+=readline
 endif
-ifeq ($(BR2_PACKAGE_READLINE_TARGET),y)
-TARGETS+=readline-target
-endif