From 4d99106cedbd4bc4fa3ac1a22e53a2b44fe04db7 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Fri, 27 Sep 2019 22:49:51 +0200 Subject: [PATCH] carl9170: config: update CMakeFiles - parser and lexer were renamed from the previous generic zconf.*.* Signed-off-by: Christian Lamparter --- config/.gitignore | 9 +++------ config/CMakeLists.txt | 12 ++++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/config/.gitignore b/config/.gitignore index f4679a3..c68f45b 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -1,7 +1,4 @@ -zconf.hash.c -zconf.tab.c conf -lex.backup -zconf.lex.c -zconf.tab.h - +parser.tab.c +parser.tab.h +lexer.lex.c diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 23e7218..e13cc88 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -11,13 +11,13 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../include/generated") -BISON_TARGET(zconf zconf.y zconf.tab.c COMPILE_FLAGS "-l -b zconf -p yy -t") -FLEX_TARGET(zconfscan zconf.l zconf.lex.c COMPILE_FLAGS "-Pyy -L") +BISON_TARGET(parser parser.y parser.tab.c COMPILE_FLAGS "-l -b parser -p yy -t") +FLEX_TARGET(lexer lexer.l lexer.lex.c COMPILE_FLAGS "-Pyy -L") -SET(zconf_deps ${FLEX_zconfscan_OUTPUTS}) -SET_SOURCE_FILES_PROPERTIES(${BISON_zconf_OUTPUTS} - PROPERTIES OBJECT_DEPENDS "${zconf_deps}") +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_zconf_OUTPUTS} ${FLEX_zconfscan_OUTPUTS}) +set(conf_src conf.c symbol.c confdata.c expr.c preprocess.c ${BISON_parser_OUTPUTS} ${FLEX_lexer_OUTPUTS}) add_executable(conf ${conf_src}) -- 2.31.1