Remove obsolete autotools unsigned long mangling of yacc output

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index d1a1362267daf14159ac10128342536b34a5ba0d..1e0b4ca1ba59b14360c779548ee31c1766c11240 100644 (file)
--- 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 ea36126e880d0195bc24ecc43d59dc1a56055e47..bbdd5ecea79c4c1811c610e023a0ce26281f9e78 100644 (file)
--- 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 21736da0138c2e44ca9a5111fb6fdff2767d8c0a..dc1247321d96d8622b2d5a381958856b7da751f3 100644 (file)
--- 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 b8177a1876cfb0cd82a25c63d68604f7cacea8da..9562c39469c01abea7ee81dac8becb456477a168 100644 (file)
--- 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" <y.tab.c | \
                @SED@ "s/YY/EX/g" | \
-               @SED@ "s/unsigned long int/uint64_t/g" | \
-               @SED@ "s/unsigned long/uint64_t/g" | \
                @SED@ "s/fprintf/sfprintf/g" | \
                @SED@ "s/FILE/Sfio_t/g" | \
                @SED@ "s/stderr/sfstderr/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