remove unnecessary intermediate files when generating gml parser

Closes #1806.

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 458e531c994004878c1c9103fb7e9562fa6a2fe3..424367e01424bc54121e2e83f103abdcd86bcf57 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -267,16 +267,8 @@ gv2gml_LDADD = \
 
 gml2gv_SOURCES = gml2gv.c gmlparse.y gmlscan.l
 
-gmlparse.c: y.tab.c
-       cp -f y.tab.c gmlparse.c
-
-gmlparse.h: y.tab.h
-       cp -f y.tab.h gmlparse.h
-
-y.tab.c y.tab.h : y.output
-
-y.output: $(top_srcdir)/cmd/tools/gmlparse.y
-       @YACC@ -Wno-yacc -dv $(top_srcdir)/cmd/tools/gmlparse.y -o y.tab.c
+gmlparse.c gmlparse.h: $(top_srcdir)/cmd/tools/gmlparse.y
+       @YACC@ -Wno-yacc -dv $(top_srcdir)/cmd/tools/gmlparse.y -o gmlparse.c
  
 gmlparse.o gmlparse.lo gmlscan.o gmlscan.lo : gmlscan.c gmlparse.h
 
@@ -342,7 +334,7 @@ EXTRA_DIST = $(man_MANS) $(pdf) bcomps.vcxproj* \
        acyclic.vcxproj* bcomps.vcxproj* ccomps.vcxproj* dijkstra.vcxproj* gc.vcxproj* \
     gvcolor.vcxproj* gvgen.vcxproj* gvpack.vcxproj* gxl2gv.vcxproj* \
        mm2gv.vcxproj* nop.vcxproj* sccmap.vcxproj* tred.vcxproj* unflatten.vcxproj* \
-       gmlscan.c gmlparse.c gmlparse.h y.output y.tab.c y.tab.h gml2gv.vcxproj* \
+       gmlscan.c gmlparse.c gmlparse.h gml2gv.vcxproj* \
        graphml2gv.vcxproj* gv2gml.vcxproj*
 
 # FIXME - these are missing
@@ -350,7 +342,7 @@ EXTRA_DIST = $(man_MANS) $(pdf) bcomps.vcxproj* \
                
 CLEANFILES = stamp.h 
 
-DISTCLEANFILES = $(pdf_DATA) gmlparse.[ch] gmlscan.c y.output y.tab.[ch] \
+DISTCLEANFILES = $(pdf_DATA) gmlparse.[ch] gmlscan.c \
        gxl2gv.1.ps sccmap.1.ps ccomps.1.ps tred.1.ps unflatten.1.ps acyclic.1.ps \
        nop.1.ps gvcolor.1.ps bcomps.1.ps gc.1.ps gvpack.1.ps mm2gv.1.ps gml2gv.1.ps \
        graphml2gv.1.ps dijkstra.1.ps gvgen.1.ps

diff --git a/cmd/tools/gml2gv.vcxproj b/cmd/tools/gml2gv.vcxproj
index 10ff04472525fb1a53ddf6cd9af9cc20d57894cc..2ae54e6f33c2d699bea7356afd935be4e6aeb607 100644 (file)
--- a/cmd/tools/gml2gv.vcxproj
+++ b/cmd/tools/gml2gv.vcxproj
@@ -73,11 +73,7 @@
     </Link>
     <PreBuildEvent>
       <Command>win_flex --outfile=gmlscan.c -i gmlscan.l
-win_bison -dy -Wno-yacc gmlparse.y -o gmlparse-intermediate.c
-copy gmlparse-intermediate.h gmlparse.h
-copy gmlparse-intermediate.c gmlparse.c
-del gmlparse-intermediate.h
-del gmlparse-intermediate.c</Command>
+win_bison -dy -Wno-yacc gmlparse.y -o gmlparse.c</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -100,11 +96,7 @@ del gmlparse-intermediate.c</Command>
     </Link>
     <PreBuildEvent>
       <Command>win_flex --outfile=gmlscan.c -i gmlscan.l
-win_bison -dy -Wno-yacc gmlparse.y -o gmlparse-intermediate.c
-copy gmlparse-intermediate.h gmlparse.h
-copy gmlparse-intermediate.c gmlparse.c
-del gmlparse-intermediate.h
-del gmlparse-intermediate.c</Command>
+win_bison -dy -Wno-yacc gmlparse.y -o gmlparse.c</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>