From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Sun, 25 Aug 2019 17:28:33 +0000 (+0900)
Subject: kconfig: split util.c out of parser.y
X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=commitdiff_plain;h=f81ba7bfcdea39cdb382bb5d1f818e795b242b8e

kconfig: split util.c out of parser.y

util.c exists both in scripts/kconfig/ and scripts/kconfig/lxdialog.

Prior to commit 54b8ae66ae1a ("kbuild: change *FLAGS_<basetarget>.o
to take the path relative to $(obj)"), Kbuild could not pass different
flags to source files with the same basename. Now that this issue
was solved, you can split util.c out of parser.y and compile them
independently of each other.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index e13cc88..5b341fc 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -18,6 +18,6 @@ SET(parser_deps ${FLEX_lexer_OUTPUTS})
 SET_SOURCE_FILES_PROPERTIES(${BISON_parser_OUTPUTS}
       PROPERTIES OBJECT_DEPENDS "${parser_deps}")
 
-set(conf_src conf.c symbol.c confdata.c expr.c preprocess.c ${BISON_parser_OUTPUTS} ${FLEX_lexer_OUTPUTS})
+set(conf_src conf.c util.c symbol.c confdata.c expr.c preprocess.c ${BISON_parser_OUTPUTS} ${FLEX_lexer_OUTPUTS})
 
 add_executable(conf ${conf_src})
diff --git a/config/parser.y b/config/parser.y
index 60936c7..b3eff96 100644
--- a/config/parser.y
+++ b/config/parser.y
@@ -727,5 +727,4 @@ void zconfdump(FILE *out)
 	}
 }
 
-#include "util.c"
 #include "menu.c"