From b3fb22f17e40656a614f21bf10094c0ee26ed8e5 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Fri, 14 Aug 2020 10:44:57 +0200 Subject: [PATCH] Remove obsolete autotools unsigned long mangling of yacc output --- cmd/tools/Makefile.am | 8 ++------ lib/cgraph/Makefile.am | 8 ++------ lib/common/Makefile.am | 8 ++------ lib/expr/Makefile.am | 4 ---- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am index d1a136226..1e0b4ca1b 100644 --- a/cmd/tools/Makefile.am +++ b/cmd/tools/Makefile.am @@ -238,14 +238,10 @@ gv2gml_LDADD = \ gml2gv_SOURCES = gml2gv.c gmlparse.y gmlscan.l gmlparse.c: y.tab.c - @SED@ "s/yy/gml/g" < y.tab.c | \ - @SED@ "s/unsigned long int/uint64_t/g" | \ - @SED@ "s/unsigned long/uint64_t/g" > gmlparse.c + @SED@ "s/yy/gml/g" < y.tab.c > gmlparse.c gmlparse.h: y.tab.h - @SED@ "s/yy/gml/g" < y.tab.h | \ - @SED@ "s/unsigned long int/uint64_t/g" | \ - @SED@ "s/unsigned long/uint64_t/g" > gmlparse.h + @SED@ "s/yy/gml/g" < y.tab.h > gmlparse.h y.tab.c y.tab.h : y.output diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am index ea36126e8..bbdd5ecea 100644 --- a/lib/cgraph/Makefile.am +++ b/lib/cgraph/Makefile.am @@ -34,14 +34,10 @@ scan.c: $(top_srcdir)/lib/cgraph/scan.l rm @LEX_OUTPUT_ROOT@.c grammar.c: y.tab.c - @SED@ "s/yy/aag/g" < y.tab.c | \ - @SED@ "s/unsigned long int/uint64_t/g" | \ - @SED@ "s/unsigned long/uint64_t/g" > grammar.c + @SED@ "s/yy/aag/g" < y.tab.c > grammar.c grammar.h: y.tab.h - @SED@ "s/yy/aag/g" < y.tab.h | \ - @SED@ "s/unsigned long int/uint64_t/g" | \ - @SED@ "s/unsigned long/uint64_t/g" > grammar.h + @SED@ "s/yy/aag/g" < y.tab.h > grammar.h y.tab.c y.tab.h: y.output diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am index 21736da01..dc1247321 100644 --- a/lib/common/Makefile.am +++ b/lib/common/Makefile.am @@ -60,14 +60,10 @@ htmllex.o htmllex.lo: htmllex.c htmllex.h htmlparse.h htmlparse.o htmlparse.lo: htmlparse.c htmlparse.h htmlparse.c: y.tab.c - @SED@ "s/yy/html/g" < y.tab.c | \ - @SED@ "s/unsigned long int/uint64_t/g" | \ - @SED@ "s/unsigned long/uint64_t/g" > htmlparse.c + @SED@ "s/yy/html/g" < y.tab.c > htmlparse.c htmlparse.h: y.tab.h - @SED@ "s/yy/html/g" < y.tab.h | \ - @SED@ "s/unsigned long int/uint64_t/g" | \ - @SED@ "s/unsigned long/uint64_t/g"> htmlparse.h + @SED@ "s/yy/html/g" < y.tab.h > htmlparse.h y.tab.c y.tab.h: y.output diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am index b8177a187..9562c3946 100644 --- a/lib/expr/Makefile.am +++ b/lib/expr/Makefile.am @@ -53,8 +53,6 @@ exop.h: exparse.h exparse.c: y.tab.c @SED@ "s/yy/ex/g" exparse.c @@ -63,8 +61,6 @@ exparse.h: y.tab.h echo "#ifndef _EXPARSE_H" > exparse.h echo "#define _EXPARSE_H" >> exparse.h @SED@ "s/yy/ex/g" < y.tab.h | \ - @SED@ "s/unsigned long int/uint64_t/g" | \ - @SED@ "s/unsigned long/uint64_t/g" | \ @SED@ "s/YY/EX/g" >> exparse.h echo "#endif /* _EXPARSE_H */" >> exparse.h -- 2.50.1