From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Thu, 27 Aug 2020 02:42:38 +0000 (-0700)
Subject: remove some now unnecessary name mangling
X-Git-Tag: 2.46.0~20^2^2~99^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9240da12ab7857975aa34279520f1f6aad113d48;p=graphviz

remove some now unnecessary name mangling
---

diff --git a/cmake/modify_cgraph_scan.cmake.in b/cmake/modify_cgraph_scan.cmake.in
deleted file mode 100644
index ea0e29dec..000000000
--- a/cmake/modify_cgraph_scan.cmake.in
+++ /dev/null
@@ -1,3 +0,0 @@
-file(READ @CMAKE_CURRENT_BINARY_DIR@/scan.c file_contents)
-string(REPLACE "yy" "aag" file_contents "${file_contents}")
-file(WRITE @CMAKE_CURRENT_BINARY_DIR@/scan.c "${file_contents}")
diff --git a/lib/cgraph/CMakeLists.txt b/lib/cgraph/CMakeLists.txt
index 4e40be39b..645d26b9d 100644
--- a/lib/cgraph/CMakeLists.txt
+++ b/lib/cgraph/CMakeLists.txt
@@ -3,28 +3,17 @@ 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 all three files
+# - 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
 )
-configure_file(
-    "${TOP_SOURCE_DIR}/cmake/modify_cgraph_scan.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/modify_cgraph_scan.cmake"
-    @ONLY
-)
 add_custom_command(
     OUTPUT ${BISON_Grammar_OUTPUTS}
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/modify_cgraph_grammar.cmake
     APPEND
 )
-add_custom_command(
-    OUTPUT ${FLEX_Scan_OUTPUTS}
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/modify_cgraph_scan.cmake
-    APPEND
-)
-
 
 add_definitions(-DEXPORT_CGRAPH -DEXPORT_AGXBUF -DEXPORT_CGHDR -DYY_NO_UNISTD_H)
 
diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am
index a524ebd4d..9585194cf 100644
--- a/lib/cgraph/Makefile.am
+++ b/lib/cgraph/Makefile.am
@@ -30,7 +30,7 @@ scan.o scan.lo: scan.c grammar.h
 
 scan.c: $(top_srcdir)/lib/cgraph/scan.l
 	@LEX@ -i $(top_srcdir)/lib/cgraph/scan.l
-	@SED@ "s/yy/aag/g" < lex.aag.c > scan.c
+	cp -f lex.aag.c scan.c
 	rm lex.aag.c
 
 grammar.c: y.tab.c