Gabriel de Perthuis ed94fea5ba kconfig/merge_config.sh: Support KCONFIG_CONFIG ...

All make targets support $KCONFIG_CONFIG because they
run scripts/kconf.  Make sure merge_config.sh accesses the
correct file in all cases.

Previously this script broke in two different code paths,
one for targets like kvmconfig (which use merge_config.sh -m
then call a target that respects KCONFIG_CONFIG) and one for
direct use of the script without -m, which called make rules
that edit KCONFIG_CONFIG but verified a different file.

Signed-off-by: Gabriel de Perthuis <g2p.code@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

2015-10-14 16:19:33 +02:00

..

lxdialog

kconfig/lxdialog: get ncurses CFLAGS with pkg-config

2014-09-23 15:47:48 +02:00

.gitignore

…

check.sh

kbuild: trivial - remove trailing empty lines

2014-06-10 00:04:06 +02:00

conf.c

kconfig: Do not print status messages in make -s mode

2015-04-09 17:44:34 +02:00

confdata.c

kconfig: Delete unnecessary checks before the function call "sym_calc_value"

2015-08-19 16:41:02 +02:00

expr.c

kconfig: allow use of relations other than (in)equality

2015-06-15 14:05:58 +02:00

expr.h

kconfig: allow use of relations other than (in)equality

2015-06-15 14:05:58 +02:00

gconf.c

kconfig: Do not print status messages in make -s mode

2015-04-09 17:44:34 +02:00

gconf.glade

…

images.c

…

kxgettext.c

…

list.h

Replace mentions of "list_struct" to "list_head"

2014-11-20 14:45:15 +01:00

lkc_proto.h

kconfig: Remove unnecessary prototypes from headers

2015-02-25 15:00:17 +01:00

lkc.h

kconfig: Remove unnecessary prototypes from headers

2015-02-25 15:00:17 +01:00

Makefile

Update the buildsystem for KConfig finding Qt

2015-10-14 15:00:25 +02:00

mconf.c

kconfig: Do not print status messages in make -s mode

2015-04-09 17:44:34 +02:00

menu.c

kconfig: Remove unnecessary prototypes from headers

2015-02-25 15:00:17 +01:00

merge_config.sh

kconfig/merge_config.sh: Support KCONFIG_CONFIG

2015-10-14 16:19:33 +02:00

nconf.c

kconfig: Do not print status messages in make -s mode

2015-04-09 17:44:34 +02:00

nconf.gui.c

…

nconf.h

…

POTFILES.in

…

qconf.cc

Port xconfig to Qt5 - Update copyright.

2015-10-14 15:00:25 +02:00

qconf.h

Port xconfig to Qt5 - Source format.

2015-10-14 14:59:03 +02:00

streamline_config.pl

localmodconfig: Use Kbuild files too

2015-08-11 17:34:35 -04:00

symbol.c

kbuild: document recursive dependency limitation / resolution

2015-10-08 15:36:16 +02:00

util.c

kconfig: Remove dead code

2015-02-25 15:00:16 +01:00

zconf.gperf

kconfig: warn of unhandled characters in Kconfig commands

2015-08-19 17:05:39 +02:00

zconf.hash.c_shipped

kconfig: Regenerate shipped zconf.{hash,lex}.c files

2015-08-19 17:05:39 +02:00

zconf.l

kconfig: warn of unhandled characters in Kconfig commands

2015-08-19 17:05:39 +02:00

zconf.lex.c_shipped

kconfig: Regenerate shipped zconf.{hash,lex}.c files

2015-08-19 17:05:39 +02:00

zconf.tab.c_shipped

kconfig: re-generate *.c_shipped files after previous change

2015-06-15 14:05:58 +02:00

zconf.y

kconfig: allow use of relations other than (in)equality

2015-06-15 14:05:58 +02:00