remove unnecessary intermediate files when generating the HTML parser

Related to #1806.

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 7b0cf6f21bc0c86e34b772b8a23377303430059f..2514aab8970c144b812d9de5127d3f179b4ced25 100644 (file)
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -59,22 +59,14 @@ svgcolor_lib : $(top_srcdir)/lib/common/svgcolor_names  $(top_srcdir)/awk/svgcol
 htmllex.o htmllex.lo: htmllex.c htmllex.h htmlparse.h
 htmlparse.o htmlparse.lo: htmlparse.c htmlparse.h
                                                                                 
-htmlparse.c: y.tab.c
-       cp -f y.tab.c htmlparse.c
-
-htmlparse.h: y.tab.h
-       cp -f y.tab.h htmlparse.h
-
-y.tab.c y.tab.h: y.output
-
-y.output: $(top_srcdir)/lib/common/htmlparse.y
-       @YACC@ -Wno-yacc -dv $(top_srcdir)/lib/common/htmlparse.y -o y.tab.c
+htmlparse.c htmlparse.h: $(top_srcdir)/lib/common/htmlparse.y
+       @YACC@ -Wno-yacc -dv $(top_srcdir)/lib/common/htmlparse.y -o htmlparse.c
 
 DISTCLEANFILES = brewer_lib color_lib colortbl.h ps_font_equiv.h \
-       y.output y.tab.[ch] htmlparse.[ch]
+       htmlparse.[ch]
 
 EXTRA_DIST = README.imap chars.tcl ps_font_equiv.h \
        htmlparse.c htmlparse.h \
-       y.tab.c y.tab.h y.output entities.html entities.tcl \
+       entities.html entities.tcl \
        brewer_colors brewer_lib svgcolor_names svgcolor_lib \
        color_names color_lib colortbl.h mksvgfonts.pl

diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj
index ce99c8f073326606b0dfd5e32a6f8c5f62129775..7dd12df123ac01c8ad2b28e8170a98d9e7299304 100644 (file)
--- a/lib/gvc.vcxproj
+++ b/lib/gvc.vcxproj
@@ -72,11 +72,7 @@
       <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>win_bison -dy -Wno-yacc common\htmlparse.y -o common\htmlparse-intermediate.c
-copy common\htmlparse-intermediate.c common\htmlparse.c
-copy common\htmlparse-intermediate.h common\htmlparse.h
-del common\htmlparse-intermediate.c
-del common\htmlparse-intermediate.h
+      <Command>win_bison -dy -Wno-yacc common\htmlparse.y -o common\htmlparse.c
 awk -f $(SolutionDir)awk\svgcolor.awk common\svgcolor_names &gt; common\svgcolor_lib
 awk -f $(SolutionDir)awk\brewer.awk common\brewer_colors &gt; common\brewer_lib
 type common\brewer_lib common\svgcolor_lib common\color_names | sort /L C &gt; color_lib
@@ -107,11 +103,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
       <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>win_bison -dy -Wno-yacc common\htmlparse.y -o common\htmlparse-intermediate.c
-copy common\htmlparse-intermediate.c common\htmlparse.c
-copy common\htmlparse-intermediate.h common\htmlparse.h
-del common\htmlparse-intermediate.c
-del common\htmlparse-intermediate.h
+      <Command>win_bison -dy -Wno-yacc common\htmlparse.y -o common\htmlparse.c
 awk -f $(SolutionDir)awk\svgcolor.awk common\svgcolor_names &gt; common\svgcolor_lib
 awk -f $(SolutionDir)awk\brewer.awk common\brewer_colors &gt; common\brewer_lib
 type common\brewer_lib common\svgcolor_lib common\color_names | sort /L C &gt; color_lib