fix paths in make test targets

diff --git a/graphs/directed/Makefile.am b/graphs/directed/Makefile.am
index 492cffea56a4ffc9c100ba983a89cf83fe122d0b..26baa05fb56964e1732a3f21c903cee94e0a3ce6 100644 (file)
--- a/graphs/directed/Makefile.am
+++ b/graphs/directed/Makefile.am
@@ -21,7 +21,7 @@ CLEANFILES = core *.dot.* *.png .xvpics/*
 test:
        for i in $(GRAPHS); do \
                echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot \
+               $(top_builddir)/cmd/dot/dot \
                        -Tcanon -o$$i.canon \
                        -Tcmap -o$$i.cmap \
                        -Tcmapx -o$$i.cmapx \
@@ -55,112 +55,112 @@ test:
 
 canon:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tcanon -o$$i.canon $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tcanon -o$$i.canon $(top_srcdir)/graphs/directed/$$i; done
 
 cmap:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tcmap -o$$i.cmap $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tcmap -o$$i.cmap $(top_srcdir)/graphs/directed/$$i; done
 
 cmapx:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tcmapx -o$$i.cmapx $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tcmapx -o$$i.cmapx $(top_srcdir)/graphs/directed/$$i; done
 
 dia:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tdia -o$$i.dia $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tdia -o$$i.dia $(top_srcdir)/graphs/directed/$$i; done
 
 dot:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tdot -o$$i.dot $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tdot -o$$i.dot $(top_srcdir)/graphs/directed/$$i; done
 
 fig:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tfig -o$$i.fig $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tfig -o$$i.fig $(top_srcdir)/graphs/directed/$$i; done
 
 gd:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tgd -o$$i.gd $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tgd -o$$i.gd $(top_srcdir)/graphs/directed/$$i; done
 
 gd2:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tgd2 -o$$i.gd2 $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tgd2 -o$$i.gd2 $(top_srcdir)/graphs/directed/$$i; done
 
 gif:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tgif -o$$i.gif $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tgif -o$$i.gif $(top_srcdir)/graphs/directed/$$i; done
 
 hpgl:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/directed/$$i; done
 
 ismap:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tismap -o$$i.ismap $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tismap -o$$i.ismap $(top_srcdir)/graphs/directed/$$i; done
 
 imap:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Timap -o$$i.imap $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Timap -o$$i.imap $(top_srcdir)/graphs/directed/$$i; done
 
 jpg:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tjpg -o$$i.jpg $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tjpg -o$$i.jpg $(top_srcdir)/graphs/directed/$$i; done
 
 mif:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tmif -o$$i.mif $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tmif -o$$i.mif $(top_srcdir)/graphs/directed/$$i; done
 
 mp:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tmp -o$$i.mp $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tmp -o$$i.mp $(top_srcdir)/graphs/directed/$$i; done
 
 pcl:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tpcl -o$$i.pcl $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tpcl -o$$i.pcl $(top_srcdir)/graphs/directed/$$i; done
 
 pic:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tpic -o$$i.pic $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tpic -o$$i.pic $(top_srcdir)/graphs/directed/$$i; done
 
 plain:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tplain -o$$i.plain $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tplain -o$$i.plain $(top_srcdir)/graphs/directed/$$i; done
 
 plain-ext:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tplain-ext -o$$i.plain-ext $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tplain-ext -o$$i.plain-ext $(top_srcdir)/graphs/directed/$$i; done
 
 png:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tpng -o$$i.png $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tpng -o$$i.png $(top_srcdir)/graphs/directed/$$i; done
 
 ps:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tps -o$$i.ps $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tps -o$$i.ps $(top_srcdir)/graphs/directed/$$i; done
 
 ps2:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tps2 -o$$i.ps2 $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tps2 -o$$i.ps2 $(top_srcdir)/graphs/directed/$$i; done
 
 svg:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tsvg -o$$i.svg $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tsvg -o$$i.svg $(top_srcdir)/graphs/directed/$$i; done
 
 svgz:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tsvgz -o$$i.svgz $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tsvgz -o$$i.svgz $(top_srcdir)/graphs/directed/$$i; done
 
 wbmp:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Twbmp -o$$i.wbmp $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Twbmp -o$$i.wbmp $(top_srcdir)/graphs/directed/$$i; done
 
 vrml:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tvrml -o$$i.vrml $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tvrml -o$$i.vrml $(top_srcdir)/graphs/directed/$$i; done
 
 vtx:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Tvtx -o$$i.vtx $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Tvtx -o$$i.vtx $(top_srcdir)/graphs/directed/$$i; done
 
 xdot:
        for i in $(GRAPHS); do echo "dot $$i"; \
-               $(top_builddir)/dotneato/dot -Txdot -o$$i.xdot $(top_srcdir)/graphs/directed/$$i; done
+               $(top_builddir)/cmd/dot/dot -Txdot -o$$i.xdot $(top_srcdir)/graphs/directed/$$i; done

diff --git a/graphs/undirected/Makefile.am b/graphs/undirected/Makefile.am
index 13a08abec5d5bb2d3e026a9a2baa78606a868219..f1051598f5a121797d9a72134a19540492c26e11 100644 (file)
--- a/graphs/undirected/Makefile.am
+++ b/graphs/undirected/Makefile.am
@@ -13,7 +13,7 @@ CLEANFILES = core *.dot.* *.png .xvpics/*
 test:
        for i in $(GRAPHS); do \
                echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato \
+               $(top_builddir)/cmd/dot/neato \
                        -Tcanon -o$$i.canon \
                        -Tcmap -o$$i.cmap \
                        -Tcmapx -o$$i.cmapx \
@@ -47,112 +47,112 @@ test:
 
 canon:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tcanon -o$$i.canon $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tcanon -o$$i.canon $(top_srcdir)/graphs/undirected/$$i; done
 
 cmap:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tcmap -o$$i.cmap $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tcmap -o$$i.cmap $(top_srcdir)/graphs/undirected/$$i; done
 
 cmapx:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tcmapx -o$$i.cmapx $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tcmapx -o$$i.cmapx $(top_srcdir)/graphs/undirected/$$i; done
 
 dia:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tdia -o$$i.dia $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tdia -o$$i.dia $(top_srcdir)/graphs/undirected/$$i; done
 
 dot:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tdot -o$$i.dot $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tdot -o$$i.dot $(top_srcdir)/graphs/undirected/$$i; done
 
 fig:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tfig -o$$i.fig $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tfig -o$$i.fig $(top_srcdir)/graphs/undirected/$$i; done
 
 gd:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tgd -o$$i.gd $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tgd -o$$i.gd $(top_srcdir)/graphs/undirected/$$i; done
 
 gd2:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tgd2 -o$$i.gd2 $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tgd2 -o$$i.gd2 $(top_srcdir)/graphs/undirected/$$i; done
 
 gif:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tgif -o$$i.gif $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tgif -o$$i.gif $(top_srcdir)/graphs/undirected/$$i; done
 
 hpgl:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/undirected/$$i; done
 
 ismap:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tismap -o$$i.ismap $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tismap -o$$i.ismap $(top_srcdir)/graphs/undirected/$$i; done
 
 imap:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Timap -o$$i.imap $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Timap -o$$i.imap $(top_srcdir)/graphs/undirected/$$i; done
 
 jpg:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tjpg -o$$i.jpg $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tjpg -o$$i.jpg $(top_srcdir)/graphs/undirected/$$i; done
 
 mif:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tmif -o$$i.mif $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tmif -o$$i.mif $(top_srcdir)/graphs/undirected/$$i; done
 
 mp:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tmp -o$$i.mp $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tmp -o$$i.mp $(top_srcdir)/graphs/undirected/$$i; done
 
 pcl:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tpcl -o$$i.pcl $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tpcl -o$$i.pcl $(top_srcdir)/graphs/undirected/$$i; done
 
 pic:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tpic -o$$i.pic $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tpic -o$$i.pic $(top_srcdir)/graphs/undirected/$$i; done
 
 plain:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tplain -o$$i.plain $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tplain -o$$i.plain $(top_srcdir)/graphs/undirected/$$i; done
 
 plain-ext:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tplain-ext -o$$i.plain-ext $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tplain-ext -o$$i.plain-ext $(top_srcdir)/graphs/undirected/$$i; done
 
 png:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tpng -o$$i.png $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tpng -o$$i.png $(top_srcdir)/graphs/undirected/$$i; done
 
 ps:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tps -o$$i.ps $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tps -o$$i.ps $(top_srcdir)/graphs/undirected/$$i; done
 
 ps2:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tps2 -o$$i.ps2 $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tps2 -o$$i.ps2 $(top_srcdir)/graphs/undirected/$$i; done
 
 svg:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tsvg -o$$i.svg $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tsvg -o$$i.svg $(top_srcdir)/graphs/undirected/$$i; done
 
 svgz:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tsvgz -o$$i.svgz $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tsvgz -o$$i.svgz $(top_srcdir)/graphs/undirected/$$i; done
 
 wbmp:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Twbmp -o$$i.wbmp $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Twbmp -o$$i.wbmp $(top_srcdir)/graphs/undirected/$$i; done
 
 vrml:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tvrml -o$$i.vrml $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tvrml -o$$i.vrml $(top_srcdir)/graphs/undirected/$$i; done
 
 vtx:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Tvtx -o$$i.vtx $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Tvtx -o$$i.vtx $(top_srcdir)/graphs/undirected/$$i; done
 
 xdot:
        for i in $(GRAPHS); do echo "neato $$i"; \
-               $(top_builddir)/dotneato/neato -Txdot -o$$i.xdot $(top_srcdir)/graphs/undirected/$$i; done
+               $(top_builddir)/cmd/dot/neato -Txdot -o$$i.xdot $(top_srcdir)/graphs/undirected/$$i; done