kbuild: move include/config/ksym/* to include/ksym/*

The idea of using fixdep was inspired by Kconfig, but autoksyms
belongs to a different group.  So, I want to move those touched
files under include/config/ksym/ to include/ksym/.

The directory include/ksym/ can be removed by 'make clean' because
it is meaningless for the external module building.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Nicolas Pitre <nico@linaro.org>

diff --git a/.gitignore b/.gitignore
index 1be78fd8163bd10677163ae10b36b874a4c615a4..85bcc269644259589f93e516e25c28910346b8f5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -87,6 +87,7 @@ modules.builtin
 #
 include/config
 include/generated
+include/ksym
 arch/*/include/generated
 
 # stgit generated dirs

diff --git a/Makefile b/Makefile
index 1e7f134dac0d038dd1c603977ec84d3e21977343..416e6b1eb4b8127899422643658e8d84f1350e05 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1336,7 +1336,7 @@ endif # CONFIG_MODULES
 # make distclean Remove editor backup files, patch leftover files and the like
 
 # Directories & files removed with 'make clean'
-CLEAN_DIRS  += $(MODVERDIR)
+CLEAN_DIRS  += $(MODVERDIR) include/ksym
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config usr/include include/generated          \

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index f9c2f07442c5a81957b034c57f44cf2ca34d0039..cce31ee876b6fee694321c369104f3d2ab38f480 100644 (file)
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -366,7 +366,7 @@ ksym_dep_filter =                                                            \
            $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;;        \
          boot*|build*|cpp_its_S|*cpp_lds_S|dtc|host*|vdso*) : ;;            \
          *) echo "Don't know how to preprocess $(1)" >&2; false ;;          \
-       esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/KSYM_\1/p'
+       esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/_\1/p'
 
 cmd_and_fixdep =                                                             \
        $(echo-cmd) $(cmd_$(1));                                             \

diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh
index e0dd0d5148ecce4c35aa47fc86191c30e9dfa694..f11cae6a041bcb1581ed4b2707fdd2e1e021bdaf 100755 (executable)
--- a/scripts/adjust_autoksyms.sh
+++ b/scripts/adjust_autoksyms.sh
@@ -80,7 +80,7 @@ sort "$cur_ksyms_file" "$new_ksyms_file" | uniq -u |
 sed -n 's/^#define __KSYM_\(.*\) 1/\1/p' | tr "A-Z_" "a-z/" |
 while read sympath; do
        if [ -z "$sympath" ]; then continue; fi
-       depfile="include/config/ksym/${sympath}.h"
+       depfile="include/ksym/${sympath}.h"
        mkdir -p "$(dirname "$depfile")"
        touch "$depfile"
        echo $((count += 1))

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 449b68c4c90cbecc6ee76b777e4fde603f3694b7..f387538c58bcb9a79d3bfd476527c3c16fe69c00 100644 (file)
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -113,11 +113,11 @@ static void usage(void)
 /*
  * Print out a dependency path from a symbol name
  */
-static void print_config(const char *m, int slen)
+static void print_dep(const char *m, int slen, const char *dir)
 {
        int c, i;
 
-       printf("    $(wildcard include/config/");
+       printf("    $(wildcard %s/", dir);
        for (i = 0; i < slen; i++) {
                c = m[i];
                if (c == '_')
@@ -140,7 +140,7 @@ static void do_extra_deps(void)
                        fprintf(stderr, "fixdep: bad data on stdin\n");
                        exit(1);
                }
-               print_config(buf, len - 1);
+               print_dep(buf, len - 1, "include/ksym");
        }
 }
 
@@ -208,7 +208,7 @@ static void use_config(const char *m, int slen)
            return;
 
        define_config(m, slen, hash);
-       print_config(m, slen);
+       print_dep(m, slen, "include/config");
 }
 
 /* test if s ends in sub */