Merge branch 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  xconfig: merge code path to conf_write()
  kconfig: do not record timestamp in .config
  gconfig: Hide unused left treeview when start up the interface
  gconfig: enable rules hint for main treeviews
  MAINTAINERS: Update KCONFIG entry
  kconfig-language: add to hints
  kconfig: Document the new "visible if" syntax
  kconfig: quiet commands when V=0
  kconfig: change update-po-config to reflect new layout of arch/um
  kconfig: make update-po-config work in KBUILD_OUTPUT
  kconfig: rearrange clean-files
  kconfig: change gconf to modify hostprogs-y like nconf and mconf
  kconfig: change qconf to modify hostprogs-y like nconf and mconf
  kconfig: only build kxgettext when needed
  nconfig: Silence unused return values from wattrset
  kconfig: Do not record timestamp in auto.conf and autoconf.h
  kconfig: get rid of unused flags
  kconfig: allow multiple inclusion of the same file
  kconfig: Avoid buffer underrun in choice input

8 files changed, 81 insertions, 78 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 368ae306aee..faa9a4701b6 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -77,14 +77,15 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
 # The symlink is used to repair a deficiency in arch/um
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
         $(Q)echo "  GEN config"
-        $(Q)xgettext --default-domain=linux              \
-            --add-comments --keyword=_ --keyword=N_      \
-            --from-code=UTF-8                            \
-            --files-from=scripts/kconfig/POTFILES.in     \
+        $(Q)xgettext --default-domain=linux                         \
+            --add-comments --keyword=_ --keyword=N_                 \
+            --from-code=UTF-8                                       \
+            --files-from=$(srctree)/scripts/kconfig/POTFILES.in     \
+            --directory=$(srctree) --directory=$(objtree)           \
             --output $(obj)/config.pot
         $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-        $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-        $(Q)(for i in `ls arch/*/Kconfig`;               \
+        $(Q)ln -fs Kconfig.x86 arch/um/Kconfig
+        $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
             do                                           \
                 echo "  GEN $$i";                        \
                 $(obj)/kxgettext $$i                     \
@@ -92,7 +93,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
             done )
         $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
             --output $(obj)/linux.pot
-        $(Q)rm -f arch/um/Kconfig.arch
+        $(Q)rm -f $(srctree)/arch/um/Kconfig
         $(Q)rm -f $(obj)/config.pot
 
 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -168,8 +169,11 @@ conf-objs	:= conf.o  zconf.tab.o
 mconf-objs     := mconf.o zconf.tab.o $(lxdialog)
 nconf-objs     := nconf.o zconf.tab.o nconf.gui.o
 kxgettext-objs  := kxgettext.o zconf.tab.o
+qconf-cxxobjs   := qconf.o
+qconf-objs      := kconfig_load.o zconf.tab.o
+gconf-objs      := gconf.o kconfig_load.o zconf.tab.o
 
-hostprogs-y := conf qconf gconf kxgettext
+hostprogs-y := conf
 
 ifeq ($(MAKECMDGOALS),nconfig)
         hostprogs-y += nconf
@@ -179,6 +183,10 @@ ifeq ($(MAKECMDGOALS),menuconfig)
         hostprogs-y += mconf
 endif
 
+ifeq ($(MAKECMDGOALS),update-po-config)
+        hostprogs-y += kxgettext
+endif
+
 ifeq ($(MAKECMDGOALS),xconfig)
         qconf-target := 1
 endif
@@ -188,16 +196,15 @@ endif
 
 
 ifeq ($(qconf-target),1)
-qconf-cxxobjs   := qconf.o
-qconf-objs      := kconfig_load.o zconf.tab.o
+        hostprogs-y += qconf
 endif
 
 ifeq ($(gconf-target),1)
-gconf-objs      := gconf.o kconfig_load.o zconf.tab.o
+        hostprogs-y += gconf
 endif
 
-clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck \
-                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
+clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck
+clean-files     += zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
 clean-files     += mconf qconf gconf nconf
 clean-files     += config.pot linux.pot
 
@@ -321,11 +328,12 @@ $(obj)/%.moc: $(src)/%.h
         $(KC_QT_MOC) -i $< -o $@
 
 $(obj)/lkc_defs.h: $(src)/lkc_proto.h
-        sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
+        $(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
 
 # Extract gconf menu items for I18N support
 $(obj)/gconf.glade.h: $(obj)/gconf.glade
-        intltool-extract --type=gettext/glade $(obj)/gconf.glade
+        $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
+        $(obj)/gconf.glade
 
 ###
 # The following requires flex/bison/gperf
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 61c35bf2d9c..2bafd9a7c8d 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -560,8 +560,6 @@ int conf_write(const char *name)
         const char *basename;
         const char *str;
         char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
-        time_t now;
-        int use_timestamp = 1;
         char *env;
 
         dirname[0] = 0;
@@ -598,19 +596,11 @@ int conf_write(const char *name)
         if (!out)
                 return 1;
 
-        time(&now);
-        env = getenv("KCONFIG_NOTIMESTAMP");
-        if (env && *env)
-                use_timestamp = 0;
-
         fprintf(out, _("#\n"
                        "# Automatically generated make config: don't edit\n"
                        "# %s\n"
-                       "%s%s"
                        "#\n"),
-                     rootmenu.prompt->text,
-                     use_timestamp ? "# " : "",
-                     use_timestamp ? ctime(&now) : "");
+                     rootmenu.prompt->text);
 
         if (!conf_get_changed())
                 sym_clear_all_valid();
@@ -784,7 +774,6 @@ int conf_write_autoconf(void)
         const char *str;
         const char *name;
         FILE *out, *tristate, *out_h;
-        time_t now;
         int i;
 
         sym_clear_all_valid();
@@ -811,22 +800,19 @@ int conf_write_autoconf(void)
                 return 1;
         }
 
-        time(&now);
         fprintf(out, "#\n"
                      "# Automatically generated make config: don't edit\n"
                      "# %s\n"
-                     "# %s"
                      "#\n",
-                     rootmenu.prompt->text, ctime(&now));
+                     rootmenu.prompt->text);
         fprintf(tristate, "#\n"
                           "# Automatically generated - do not edit\n"
                           "\n");
         fprintf(out_h, "/*\n"
                        " * Automatically generated C config: don't edit\n"
                        " * %s\n"
-                       " * %s"
                        " */\n",
-                       rootmenu.prompt->text, ctime(&now));
+                       rootmenu.prompt->text);
 
         for_all_symbols(i, sym) {