From b7001fb637eaaf43319038284079ca6237fde06e Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Wed, 31 Oct 2007 06:37:44 +0000
Subject: [PATCH] Improve config for nCFTP

---
 package/ncftp/Config.in | 43 +++++++++++++++++++++++++++++++----------
 package/ncftp/ncftp.mk  | 25 ++++++++++++++++++++++--
 2 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in
index 7908ed009d..c1028f2271 100644
--- a/package/ncftp/Config.in
+++ b/package/ncftp/Config.in
@@ -7,14 +7,37 @@ config BR2_PACKAGE_NCFTP
 
 	  http://www.ncftp.com/ncftp/
 
-config BR2_PACKAGE_NCFTP_UTILS
-	bool "install utils (ncftpput, ncftpget, ncftpls)"
+menu "ncFTP tools selection"
+	depends BR2_PACKAGE_NCFTP
+
+config BR2_PACKAGE_NCFTP_GET
+	bool "NcFTPGet - command-line utility program"
+	default y
+	depends BR2_PACKAGE_NCFTP
+
+config BR2_PACKAGE_NCFTP_PUT
+	bool "NcFTPPut - command-line utility program"
+	default y
+	depends BR2_PACKAGE_NCFTP
+
+config BR2_PACKAGE_NCFTP_LS
+	bool "NcFTPLs - command-line utility program"
+	default y
+	depends BR2_PACKAGE_NCFTP
+
+config BR2_PACKAGE_NCFTP_BATCH
+	bool "NcFTPBatch - background FTP program for individual users"
+	default y
+	depends BR2_PACKAGE_NCFTP
+
+config BR2_PACKAGE_NCFTP_SPOOLER
+	bool "NcFTPSpooler - spooler - not working properly"
 	default n
-	depends on BR2_PACKAGE_NCFTP
-	help
-	  This will also install:
-	  - NcFTPGet - command-line utility program
-	  - NcFTPPut - command-line utility program
-	  - NcFTPLs - command-line utility program
-	  - NcFTPBatch - background FTP program for individual users
-	  - NcFTPSpooler - background batch FTP service for systems
+	depends BR2_PACKAGE_NCFTP
+
+config BR2_PACKAGE_NCFTP_BOOKMARKS
+	bool "NcFTPBookmarks - not working properly"
+	default n
+	depends BR2_PACKAGE_NCFTP
+
+endmenu
diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index 1a0ba94b17..911c8cefc5 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -10,8 +10,29 @@ NCFTP_DIR:=$(BUILD_DIR)/ncftp-$(NCFTP_VERSION)
 
 NCFTP_TARGET_BINS:=ncftp
 
-ifeq ($(strip $(BR2_PACKAGE_NCFTP_UTILS)),y)
-NCFTP_TARGET_BINS+=ncftpbatch ncftpbookmarks ncftpget ncftpls ncftpput
+ifeq ($(strip $(BR2_PACKAGE_NCFTP_GET)),y)
+NCFTP_TARGET_BINS+=ncftpget
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_NCFTP_PUT)),y)
+NCFTP_TARGET_BINS+=ncftpput
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_NCFTP_LS)),y)
+NCFTP_TARGET_BINS+=ncftpls
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_NCFTP_BATCH)),y)
+NCFTP_TARGET_BINS+=ncftpbatch
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_NCFTP_SPOOLER)),y)
+#Someone needs to figure out what to do...
+NCFTP_TARGET_BINS+=
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_NCFTP_BOOKMARKS)),y)
+NCFTP_TARGET_BINS+=ncftpbookmarks
 endif
 
 ncftp-source: $(DL_DIR)/$(NCFTP_SOURCE)
-- 
2.30.2