From cd8f13b70afb9ddc4a1a3c5dc408b126f6e04c44 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Mon, 24 Aug 2020 19:06:28 -0700 Subject: [PATCH] remove now unnecessary find-and-replace step --- cmake/modify_cgraph_grammar.cmake.in | 7 ------- lib/cgraph/CMakeLists.txt | 13 ------------- lib/cgraph/Makefile.am | 4 ++-- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 cmake/modify_cgraph_grammar.cmake.in diff --git a/cmake/modify_cgraph_grammar.cmake.in b/cmake/modify_cgraph_grammar.cmake.in deleted file mode 100644 index 231b5e938..000000000 --- a/cmake/modify_cgraph_grammar.cmake.in +++ /dev/null @@ -1,7 +0,0 @@ -file(READ @CMAKE_CURRENT_BINARY_DIR@/grammar.h file_contents) -string(REPLACE "yy" "aag" file_contents "${file_contents}") -file(WRITE @CMAKE_CURRENT_BINARY_DIR@/grammar.h "${file_contents}") - -file(READ @CMAKE_CURRENT_BINARY_DIR@/grammar.c file_contents) -string(REPLACE "yy" "aag" file_contents "${file_contents}") -file(WRITE @CMAKE_CURRENT_BINARY_DIR@/grammar.c "${file_contents}") diff --git a/lib/cgraph/CMakeLists.txt b/lib/cgraph/CMakeLists.txt index 645d26b9d..b81230b1e 100644 --- a/lib/cgraph/CMakeLists.txt +++ b/lib/cgraph/CMakeLists.txt @@ -2,19 +2,6 @@ BISON_TARGET(Grammar grammar.y ${CMAKE_CURRENT_BINARY_DIR}/grammar.c) FLEX_TARGET(Scan scan.l ${CMAKE_CURRENT_BINARY_DIR}/scan.c) ADD_FLEX_BISON_DEPENDENCY(Scan Grammar) -# Modify files generated by Bison and Flex, to match the Autotools build. -# - Replace "yy" with "aag" in two files -configure_file( - "${TOP_SOURCE_DIR}/cmake/modify_cgraph_grammar.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/modify_cgraph_grammar.cmake" - @ONLY -) -add_custom_command( - OUTPUT ${BISON_Grammar_OUTPUTS} - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/modify_cgraph_grammar.cmake - APPEND -) - add_definitions(-DEXPORT_CGRAPH -DEXPORT_AGXBUF -DEXPORT_CGHDR -DYY_NO_UNISTD_H) include_directories( diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am index 475dd516e..6a55bc8f3 100644 --- a/lib/cgraph/Makefile.am +++ b/lib/cgraph/Makefile.am @@ -32,10 +32,10 @@ scan.c: $(top_srcdir)/lib/cgraph/scan.l @LEX@ --outfile=$@ -i $(top_srcdir)/lib/cgraph/scan.l grammar.c: y.tab.c - @SED@ "s/yy/aag/g" < y.tab.c > grammar.c + cp -f y.tab.c grammar.c grammar.h: y.tab.h - @SED@ "s/yy/aag/g" < y.tab.h > grammar.h + cp -f y.tab.h grammar.h y.tab.c y.tab.h: y.output -- 2.40.0