From dbe3877285549d1cdc549826673cdf8f07cf154c Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 21 Feb 2018 23:34:58 -0800
Subject: Install ct-ng

Also, move kconfig.mk into the main driver - we'd want kconfig to be a sub-package
so there's no sense in writing the installation framework for the ct-ng-specific
fragment in an otherwise independent directory.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 kconfig/Makefile.am |  4 +++-
 kconfig/kconfig.mk  | 68 -----------------------------------------------------
 2 files changed, 3 insertions(+), 69 deletions(-)
 delete mode 100644 kconfig/kconfig.mk

(limited to 'kconfig')

diff --git a/kconfig/Makefile.am b/kconfig/Makefile.am
index 1b4a06ca..413d9446 100644
--- a/kconfig/Makefile.am
+++ b/kconfig/Makefile.am
@@ -1,7 +1,9 @@
 ## vim: set noet :
 
-## TBD install into lib/crosstool-ng/kconfig?
 ## TBD turn off program renaming for these? Or account for it in ct-ng script?
+transform		= s,x,x,
+
+## TBD install into lib/crosstool-ng/kconfig? or move to libexec which seems more suitable
 pkglibexec_PROGRAMS    = conf nconf mconf
 
 AM_LFLAGS		= -L -Pzconf
diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk
deleted file mode 100644
index c489c724..00000000
--- a/kconfig/kconfig.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# ===========================================================================
-# crosstool-NG configuration targets
-# These targets are used from top-level makefile
-
-#-----------------------------------------------------------
-# The configurators rules
-
-# Top file of crosstool-NG configuration
-export KCONFIG_TOP = $(CT_LIB_DIR)/config/config.in
-
-# We need CONF for savedefconfig in scripts/saveSample.sh
-export CONF  := $(CT_LIB_DIR)/kconfig/conf
-MCONF := $(CT_LIB_DIR)/kconfig/mconf
-NCONF := $(CT_LIB_DIR)/kconfig/nconf
-
-# Used by conf/mconf/nconf to find the .in files
-export srctree=$(CT_LIB_DIR)
-
-.PHONY: menuconfig nconfig oldconfig savedefconfig defconfig
-
-menuconfig:
-	@$(CT_ECHO) "  CONF  $@"
-	$(SILENT)$(MCONF) $(KCONFIG_TOP)
-
-nconfig:
-	@$(CT_ECHO) "  CONF  $@"
-	$(SILENT)$(NCONF) $(KCONFIG_TOP)
-
-oldconfig: .config
-	@$(CT_ECHO) "  CONF  $@"
-	$(SILENT)$(sed) -i -r -f $(CT_LIB_DIR)/scripts/upgrade.sed $<
-	$(SILENT)$(CONF) --silent$@ $(KCONFIG_TOP)
-
-savedefconfig: .config
-	@$(CT_ECHO) '  GEN   $@'
-	$(SILENT)$(CONF) --savedefconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP)
-
-defconfig:
-	@$(CT_ECHO) '  CONF  $@'
-	$(SILENT)$(CONF) --defconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP)
-
-# Always be silent, the stdout an be >.config
-extractconfig:
-	@$(awk) 'BEGIN { dump=0; }                                                  \
-	         dump==1 && $$0~/^\[.....\][[:space:]]+(# )?CT_/ {                  \
-	             $$1="";                                                        \
-	             gsub("^[[:space:]]","");                                       \
-	             print;                                                         \
-	         }                                                                  \
-	         $$0~/Dumping user-supplied crosstool-NG configuration: done in/ {  \
-	             dump=0;                                                        \
-	         }                                                                  \
-	         $$0~/Dumping user-supplied crosstool-NG configuration$$/ {         \
-	             dump=1;                                                        \
-	         }'
-
-#-----------------------------------------------------------
-# Help text used by make help
-
-help-config::
-	@echo  '  menuconfig         - Update current config using a menu based program'
-	@echo  '  nconfig            - Update current config using a menu based program'
-	@echo  '  oldconfig          - Update current config using a provided .config as base'
-	@echo  '  extractconfig      - Extract to stdout the configuration items from a'
-	@echo  '                       build.log file piped to stdin'
-	@echo  '  savedefconfig      - Save current config as a mini-defconfig to $${DEFCONFIG}'
-	@echo  '  defconfig          - Update config from a mini-defconfig $${DEFCONFIG}'
-	@echo  '                       (default: $${DEFCONFIG}=./defconfig)'
-- 
cgit v1.2.3