From 404a10227cf8f135796e776a8a42582672a2968c Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@free.fr>
Date: Mon, 9 Apr 2012 20:37:31 +0200
Subject: [PATCH] utils/: new directory for kconfig utilities, install them

Create a new directory to store the utilities that deal
with kconfig files, .config and .in alike.

For now, only the scripts are installed

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 Makefile.am                                        |  5 ++++-
 configure.ac                                       | 14 ++++++++++++++
 {misc => scripts}/kernel2kfrontends.list           | 10 +++++-----
 scripts/ksync.sh                                   |  2 +-
 utils/Makefile.am                                  |  2 ++
 misc/diffconfig => utils/kconfig-diff              |  0
 misc/kxgettext.c => utils/kconfig-gettext.c        |  0
 misc/merge_config.sh => utils/kconfig-merge        |  0
 .../kconfig-streamline                             |  0
 misc/config => utils/kconfig-tweak                 |  0
 10 files changed, 26 insertions(+), 7 deletions(-)
 rename {misc => scripts}/kernel2kfrontends.list (86%)
 create mode 100644 utils/Makefile.am
 rename misc/diffconfig => utils/kconfig-diff (100%)
 rename misc/kxgettext.c => utils/kconfig-gettext.c (100%)
 rename misc/merge_config.sh => utils/kconfig-merge (100%)
 rename misc/streamline_config.pl => utils/kconfig-streamline (100%)
 rename misc/config => utils/kconfig-tweak (100%)

diff --git a/Makefile.am b/Makefile.am
index a889ad7..c4a2e19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,6 @@
 ACLOCAL_AMFLAGS = -I scripts/.autostuff/m4
-SUBDIRS = docs libs frontends
+if COND_utils
+    MAYBE_utils = utils
+endif
+SUBDIRS = docs libs frontends $(MAYBE_utils)
 EXTRA_DIST = bootstrap
diff --git a/configure.ac b/configure.ac
index 7f095b4..1d69a8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,13 @@ AC_ARG_ENABLE(
                 [config_prefix=$enableval])])
 AC_SUBST([config_prefix], [${config_prefix-CONFIG_}])
 
+AC_ARG_ENABLE(
+    [utils],
+    [AS_HELP_STRING(
+        [--enable-utils],
+        [install utilities to manage .config files (default=no)])])
+AC_SUBST([enable_utils], [${enable_utils:-no}])
+
 #----------------------------------------
 # Options to selectively enable/disable frontends
 # All are selected by default
@@ -385,6 +392,9 @@ AM_CONDITIONAL(
 AM_CONDITIONAL(
     [COND_images],
     [test "$need_images" = "yes"])
+AM_CONDITIONAL(
+    [COND_utils],
+    [test "$enable_utils" = "yes"])
 
 #----------------------------------------
 # Get the version to apply to the parser shared library
@@ -407,11 +417,15 @@ AC_CONFIG_FILES([
     frontends/nconf/Makefile
     frontends/gconf/Makefile
     frontends/qconf/Makefile
+    utils/Makefile
 ])
 AC_OUTPUT
 
 AC_MSG_NOTICE()
 AC_MSG_NOTICE([Configured with:])
+AS_IF([test "$enable_utils" = "yes"],
+      [AC_MSG_NOTICE([- install utilities       : yes])],
+      [AC_MSG_NOTICE([- install utilities       : no])])
 AS_IF([test "$enable_wall" = "yes"],
       [AC_MSG_NOTICE([- catch all warnings      : yes])],
       [AC_MSG_NOTICE([- catch all warnings      : no])])
diff --git a/misc/kernel2kfrontends.list b/scripts/kernel2kfrontends.list
similarity index 86%
rename from misc/kernel2kfrontends.list
rename to scripts/kernel2kfrontends.list
index c735d03..44f597a 100644
--- a/misc/kernel2kfrontends.list
+++ b/scripts/kernel2kfrontends.list
@@ -27,10 +27,10 @@ scripts/kconfig/menu.c                            -->  libs/parser/menu.c
 scripts/kconfig/symbol.c                          -->  libs/parser/symbol.c
 scripts/kconfig/util.c                            -->  libs/parser/util.c
 scripts/kconfig/zconf.y                           -->  libs/parser/yconf.y
-scripts/config                                    -->  misc/config
-scripts/diffconfig                                -->  misc/diffconfig
-scripts/kconfig/kxgettext.c                       -->  misc/kxgettext.c
-scripts/kconfig/merge_config.sh                   -->  misc/merge_config.sh
-scripts/kconfig/streamline_config.pl              -->  misc/streamline_config.pl
+scripts/config                                    -->  utils/kconfig-tweak
+scripts/diffconfig                                -->  utils/kconfig-diff
+scripts/kconfig/merge_config.sh                   -->  utils/kconfig-merge
+scripts/kconfig/streamline_config.pl              -->  utils/kconfig-streamline
+scripts/kconfig/kxgettext.c                       -->  utils/kconfig-gettext.c
 Documentation/kbuild/kconfig-language.txt         -->  docs/kconfig-language.txt
 Documentation/kbuild/kconfig.txt                  -->  docs/kconfig.txt
diff --git a/scripts/ksync.sh b/scripts/ksync.sh
index e45b38e..74aad8c 100755
--- a/scripts/ksync.sh
+++ b/scripts/ksync.sh
@@ -37,7 +37,7 @@ printf "%d.%d.%d%s %s %s\n%s\n"             \
        "${kf_version}"                      \
        >.version
 
-exec <misc/kernel2kfrontends.list
+exec <scripts/kernel2kfrontends.list
 while read k_file trash kf_file; do
     mkdir -p "${kf_file%/*}"
     cp -v "${k_dir}/${k_file}" "${kf_file}"
diff --git a/utils/Makefile.am b/utils/Makefile.am
new file mode 100644
index 0000000..b1a24fa
--- /dev/null
+++ b/utils/Makefile.am
@@ -0,0 +1,2 @@
+dist_bin_SCRIPTS =  kconfig-tweak kconfig-diff kconfig-merge
+dist_bin_SCRIPTS += kconfig-streamline
diff --git a/misc/diffconfig b/utils/kconfig-diff
similarity index 100%
rename from misc/diffconfig
rename to utils/kconfig-diff
diff --git a/misc/kxgettext.c b/utils/kconfig-gettext.c
similarity index 100%
rename from misc/kxgettext.c
rename to utils/kconfig-gettext.c
diff --git a/misc/merge_config.sh b/utils/kconfig-merge
similarity index 100%
rename from misc/merge_config.sh
rename to utils/kconfig-merge
diff --git a/misc/streamline_config.pl b/utils/kconfig-streamline
similarity index 100%
rename from misc/streamline_config.pl
rename to utils/kconfig-streamline
diff --git a/misc/config b/utils/kconfig-tweak
similarity index 100%
rename from misc/config
rename to utils/kconfig-tweak
-- 
2.39.5