From d7cb72db645f0901ddeb51c7a559b2a25888e65a Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Sun, 25 Jan 2009 08:18:35 +0000 Subject: Part of NcFTP depends on ncurses, create dependencies, if needed --- package/ncftp/Config.in | 6 ++++-- package/ncftp/ncftp.mk | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in index d7c63ba0e..652825de1 100644 --- a/package/ncftp/Config.in +++ b/package/ncftp/Config.in @@ -30,11 +30,13 @@ config BR2_PACKAGE_NCFTP_BATCH depends on BR2_PACKAGE_NCFTP config BR2_PACKAGE_NCFTP_SPOOLER - bool "NcFTPSpooler - spooler - not working properly" + bool "NcFTPSpooler - spooler" depends on BR2_PACKAGE_NCFTP + depends on BR2_PACKAGE_NCURSES config BR2_PACKAGE_NCFTP_BOOKMARKS - bool "NcFTPBookmarks - not working properly" + bool "NcFTPBookmarks" depends on BR2_PACKAGE_NCFTP + depends on BR2_PACKAGE_NCURSES endmenu diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 70f0fd618..4a4a9a643 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -26,15 +26,20 @@ ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y) NCFTP_TARGET_BINS+=ncftpbatch endif +ifeq ($(BR2_PACKAGE_NCURSES),y) ifeq ($(BR2_PACKAGE_NCFTP_SPOOLER),y) #Someone needs to figure out what to do... NCFTP_TARGET_BINS+= endif +# only set if NCURSES is available ifeq ($(BR2_PACKAGE_NCFTP_BOOKMARKS),y) NCFTP_TARGET_BINS+=ncftpbookmarks endif +NCFTP_DEPS += ncurses +endif + ncftp-source: $(DL_DIR)/$(NCFTP_SOURCE) $(DL_DIR)/$(NCFTP_SOURCE): @@ -64,7 +69,7 @@ $(TARGET_DIR)/usr/bin/ncftp $(TARGET_DIR)/usr/bin/ncftp%: $(addprefix $(NCFTP_DI $(INSTALL) -m 0755 $(NCFTP_DIR)/bin/$(notdir $@) $(TARGET_DIR)/usr/bin $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -ncftp: uclibc $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS)) +ncftp: uclibc $(NCFTP_DEPS) $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS)) ncftp-clean: -$(MAKE) -C $(NCFTP_DIR) clean -- cgit v1.2.3