From 6992fdfae5cdcff19e34723c4878ae19e7239684 Mon Sep 17 00:00:00 2001 From: ellson Date: Fri, 22 Jul 2005 02:22:38 +0000 Subject: [PATCH] finally! more automake magic, disable ocaml and io for now, ln hello.dot into test-*/ dirs --- tclpkg/gv/Makefile.am | 150 ++++++++++++++++++++---------------------- tclpkg/gv/test.java | 2 +- tclpkg/gv/test.php | 2 +- tclpkg/gv/test.pl | 2 +- tclpkg/gv/test.py | 2 +- tclpkg/gv/test.rb | 2 +- tclpkg/gv/test.tcl | 2 +- 7 files changed, 76 insertions(+), 86 deletions(-) diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am index ec327e31e..b8fab5723 100644 --- a/tclpkg/gv/Makefile.am +++ b/tclpkg/gv/Makefile.am @@ -12,85 +12,75 @@ LIBS = @LIBS@ -lc BASELIBS = $(top_builddir)/lib/gvc/libgvc.la -CSHARP_cpp = gv_csharp.cpp CSHARP_hdr = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs libgv_csharp_la_SOURCES = gv.cpp gv.i -libgv_csharp_la_DEPENDENCIES = gv.cpp $(CSHARP_cpp) -libgv_csharp_la_LIBADD = $(BASELIBS) @CSHARP_LIBS@ -$(CSHARP_cpp) $(CSHARP_hdr): gv.i - $(SWIG) -c++ -csharp -o $(CSHARP_cpp) gv.i +libgv_csharp_la_DEPENDENCIES = gv.lo gv_csharp.lo +libgv_csharp_la_LIBADD = gv_csharp.lo $(BASELIBS) @CSHARP_LIBS@ +gv_csharp.cpp $(CSHARP_hdr): gv.i + $(SWIG) -c++ -csharp -o gv_csharp.cpp gv.i -GUILE_cpp = gv_guile.cpp GUILE_hdr = libgv_guile_la_SOURCES = gv.cpp gv.i -libgv_guile_la_DEPENDENCIES = gv.cpp $(GUILE_cp) -libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@ -$(GUILE_cp) $(GUILE_hdr): gv.i - $(SWIG) -c++ -guile -o $(GUILE_cp) gv.i +libgv_guile_la_DEPENDENCIES = gv.lo gv_guile.lo +libgv_guile_la_LIBADD = gv_guile.lo $(BASELIBS) @GUILE_LIBS@ +gv_guile.cpp $(GUILE_hdr): gv.i + $(SWIG) -c++ -guile -o gv_guile.cpp gv.i -IO_cpp = gv_io.cpp IO_hdr = libgv_io_la_SOURCES = gv.cpp gv.i -libgv_io_la_DEPENDENCIES = gv.cpp $(IO_cpp) -libgv_io_la_LIBADD = $(BASELIBS) @IO_LIBS@ -$(IO_cpp) $(IO_hdr): gv.i - $(SWIG) -c++ -io -o $(IO_cpp) gv.i +libgv_io_la_DEPENDENCIES = gv.lo gv_io.lo +libgv_io_la_LIBADD = gv_io.lo $(BASELIBS) @IO_LIBS@ +gv_io.cpp $(IO_hdr): gv.i + $(SWIG) -c++ -io -o gv_io.cpp gv.i -JAVA_cpp = gv_java.cpp JAVA_hdr = gv.java gvJNI.java SWIGTYPE_p_Agraph_t.java SWIGTYPE_p_Agnode_t.java SWIGTYPE_p_Agedge_t.java libgv_java_la_SOURCES = gv.cpp gv.i -libgv_java_la_DEPENDENCIES = gv.cpp $(JAVA_cpp) -libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@ -$(JAVA_cpp) $(JAVA_hdr): gv.i - $(SWIG) -c++ -java -o $(JAVA_cpp) gv.i +libgv_java_la_DEPENDENCIES = gv.lo gv_java.lo +libgv_java_la_LIBADD = gv_java.lo $(BASELIBS) @JAVA_LIBS@ +gv_java.cpp $(JAVA_hdr): gv.i + $(SWIG) -c++ -java -o gv_java.cpp gv.i -OCAML_cpp = gv_ocaml.cpp OCAML_hdr = gv.ml gv.mli libgv_ocaml_la_SOURCES = gv.cpp gv.i -libgv_ocaml_la_DEPENDENCIES = gv.cpp $(OCAML_cpp) -libgv_ocaml_la_LIBADD = $(BASELIBS) @IO_LIBS@ -$(OCAML_cpp) $(OCAML_hdr): gv.i - $(SWIG) -c++ -ocaml -o $(OCAML_cpp) gv.i +libgv_ocaml_la_DEPENDENCIES = gv.lo gv_ocaml.lo +libgv_ocaml_la_LIBADD = gv_ocaml.lo $(BASELIBS) @IO_LIBS@ +gv_ocaml.cpp $(OCAML_hdr): gv.i + $(SWIG) -c++ -ocaml -o gv_ocaml.cpp gv.i -PERL_cpp = gv_perl.cpp PERL_hdr = gv.pm libgv_perl_la_SOURCES = gv.cpp gv.i -libgv_perl_la_DEPENDENCIES = gv.cpp $(PERL_cpp) -libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@ -$(PERL_cpp) $(PERL_hdr): gv.i - $(SWIG) -c++ -perl -o $(PERL_cpp) gv.i +libgv_perl_la_DEPENDENCIES = gv.lo gv_perl.lo +libgv_perl_la_LIBADD = gv_perl.lo $(BASELIBS) @PERL_LIBS@ +gv_perl.cpp $(PERL_hdr): gv.i + $(SWIG) -c++ -perl -o gv_perl.cpp gv.i -PHP_cpp = gv_php.cpp PHP_hdr = gv.php php_gv.h libgv_php_la_SOURCES = gv.cpp gv.i -libgv_php_la_DEPENDENCIES = gv.cpp $(PHP_cpp) -libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@ -$(PHP_cpp) $(PHP_hdr): gv.i - $(SWIG) -c++ -php -o $(PHP_cpp) gv.i +libgv_php_la_DEPENDENCIES = gv.lo gv_php.lo +libgv_php_la_LIBADD = gv_php.lo $(BASELIBS) @PHP_LIBS@ +gv_php.cpp $(PHP_hdr): gv.i + $(SWIG) -c++ -php -o gv_php.cpp gv.i -PYTHON_cpp = gv_python.cpp PYTHON_hdr = gv.py libgv_python_la_SOURCES = gv.cpp gv.i -libgv_python_la_DEPENDENCIES = gv.cpp $(PYTHON_cpp) -libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@ -$(PYTHON_cpp) $(PYTHON_hdr): gv.i - $(SWIG) -c++ -python -o $(PYTHON_cpp) gv.i +libgv_python_la_DEPENDENCIES = gv.lo gv_python.lo +libgv_python_la_LIBADD = gv_python.lo $(BASELIBS) @PYTHON_LIBS@ +gv_python.cpp $(PYTHON_hdr): gv.i + $(SWIG) -c++ -python -o gv_python.cpp gv.i -RUBY_cpp = gv_ruby.cpp RUBY_hdr = libgv_ruby_la_SOURCES = gv.cpp gv.i -libgv_ruby_la_DEPENDENCIES = gv.cpp $(RUBY_cpp) -libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@ -$(RUBY_cpp) $(RUBY_hdr): gv.i - $(SWIG) -c++ -ruby -o $(RUBY_cpp) gv.i +libgv_ruby_la_DEPENDENCIES = gv.lo gv_ruby.lo +libgv_ruby_la_LIBADD = gv_ruby.lo $(BASELIBS) @RUBY_LIBS@ +gv_ruby.cpp $(RUBY_hdr): gv.i + $(SWIG) -c++ -ruby -o gv_ruby.cpp gv.i -TCL_cpp = gv_tcl.cpp TCL_hdr = libgv_tcl_la_SOURCES = gv.cpp gv.i -libgv_tcl_la_DEPENDENCIES = gv.cpp $(TCL_cpp) -libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs.la $(BASELIBS) @TCL_LIBS@ -$(TCL_cpp) $(TCL_hdr): gv.i - $(SWIG) -c++ -tcl -namespace -o $(TCL_cpp) gv.i +libgv_tcl_la_DEPENDENCIES = gv.lo gv_tcl.lo +libgv_tcl_la_LIBADD = gv_tcl.lo $(top_builddir)/tclpkg/tclstubs/libtclstubs.la $(BASELIBS) @TCL_LIBS@ +gv_tcl.cpp $(TCL_hdr): gv.i + $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp gv.i pkginclude_DATA = gv.i gv.cpp @@ -107,21 +97,21 @@ pkginclude_DATA += $(GUILE_hdr) pkglib_LTLIBRARIES += libgv_guile.la TESTS += test_guile endif -if WITH_IO -pkginclude_DATA += $(IO_hdr) -pkglib_LTLIBRARIES += libgv_io.la -TESTS += test_io -endif +#if WITH_IO +#pkginclude_DATA += $(IO_hdr) +#pkglib_LTLIBRARIES += libgv_io.la +#TESTS += test_io +#endif if WITH_JAVA pkginclude_DATA += $(JAVA_hdr) pkglib_LTLIBRARIES += libgv_java.la TESTS += test_java endif -if WITH_OCAML -pkginclude_DATA += $(OCAML_hdr) -pkglib_LTLIBRARIES += libgv_ocaml.la -TESTS += test_ocaml -endif +#if WITH_OCAML +#pkginclude_DATA += $(OCAML_hdr) +#pkglib_LTLIBRARIES += libgv_ocaml.la +#TESTS += test_ocaml +#endif if WITH_PERL pkginclude_DATA += $(PERL_hdr) pkglib_LTLIBRARIES += libgv_perl.la @@ -162,7 +152,7 @@ test: $(TESTS) test_csharp: libgv_csharp.la -(mkdir -p test_csharp; cd test_csharp; \ ln -fs ../.libs/libgv_csharp.so libgv.so; \ - ln -fs ../*.cs .; \ + ln -fs ../*.dot ../*.cs .; \ $(CSHARP) *.cs; \ LD_LIBRARY_PATH=. $(CSHARP) test) @@ -170,14 +160,14 @@ test_csharp: libgv_csharp.la test_guile: libgv_guile.la -(mkdir -p test_guile; cd test_guile; \ ln -fs ../.libs/libgv_guile.so libgv.so; \ - ln -fs ../*.guile .; \ + ln -fs ../*.dot ../*.guile .; \ $(GUILE) -s test.guile) .PHONY: test_io test_io: libgv_io.la -(mkdir -p test_io; cd test_io; \ ln -fs ../.libs/libgv_io.so libgv.so; \ - cp -f ../*.io .; \ + ln -fs ../*.dot ../*.io .; \ ioc *.io; \ LD_LIBRARY_PATH=. io test) @@ -185,7 +175,7 @@ test_io: libgv_io.la test_java: libgv_java.la -(mkdir -p test_java; cd test_java; \ ln -fs ../.libs/libgv_java.so libgv.so; \ - ln -fs ../*.java .; \ + ln -fs ../*.dot ../*.java .; \ javac *.java; \ LD_LIBRARY_PATH=. CLASSPATH=. java test) @@ -193,7 +183,7 @@ test_java: libgv_java.la test_ocaml: libgv_ocaml.la -(mkdir -p test_ocaml; cd test_ocaml; \ ln -fs ../.libs/libgv_ocaml.so libgv.so; \ - ln -fs ../*.ocaml .; \ + ln -fs ../*.dot ../*.ocaml .; \ ocamlc *.ocaml; \ LD_LIBRARY_PATH=. ocaml test) @@ -201,35 +191,35 @@ test_ocaml: libgv_ocaml.la test_perl: libgv_perl.la -(mkdir -p test_perl; cd test_perl; \ ln -fs ../.libs/libgv_perl.so gv.so; \ - ln -fs ../*.p[lm] .; \ + ln -fs ../*.dot ../*.p[lm] .; \ $(PERL) ./test.pl) .PHONY: test_php test_php: libgv_php.la -(mkdir -p test_php; cd test_php; \ ln -fs ../.libs/libgv_php.so libgv.so; \ - ln -fs ../*.php .; \ + ln -fs ../*.dot ../*.php .; \ $(PHP) ./test.php) .PHONY: test_python test_python: libgv_python.la -(mkdir -p test_python; cd test_python; \ ln -fs ../.libs/libgv_python.so _gv.so; \ - ln -fs ../*.py .; \ + ln -fs ../*.dot ../*.py .; \ PYTHONPATH=. $(PYTHON) test.py) .PHONY: test_ruby test_ruby: libgv_ruby.la -(mkdir -p test_ruby; cd test_ruby; \ ln -fs ../.libs/libgv_ruby.so gv.so; \ - ln -fs ../*.rb .; \ + ln -fs ../*.dot ../*.rb .; \ $(RUBY) test.rb) .PHONY: test_tcl test_tcl: libgv_tcl.la -(mkdir -p test_tcl; cd test_tcl; \ ln -fs ../.libs/libgv_tcl.so libgv_tcl.so; \ - ln -fs ../*.tcl .; \ + ln -fs ../*.dot ../*.tcl .; \ $(TCLSH) ./test.tcl) EXTRA_DIST = demo/* @@ -237,13 +227,13 @@ EXTRA_DIST = demo/* CLEANFILES = test_*/* DISTCLEANFILES = \ - $(CSHARP_cpp) $(CSHARP_hdr) \ - $(GUILE_cp) $(GUILE_hdr) \ - $(IO_cpp) $(IO_hdr) \ - $(JAVA_cpp) $(JAVA_hdr) \ - $(OCAML_cpp) $(OCAML_hdr) \ - $(PERL_cpp) $(PERL_hdr) \ - $(PHP_cpp) $(PHP_hdr) \ - $(PYTHON_cpp) $(PYTHON_hdr) \ - $(RUBY_cpp) $(RUBY_hdr) \ - $(TCL_cpp) $(TCL_hdr) + gv_csharp.cpp $(CSHARP_hdr) \ + gv_guile.cpp $(GUILE_hdr) \ + gv_io.cpp $(IO_hdr) \ + gv_java.cpp $(JAVA_hdr) \ + gv_ocaml.cpp $(OCAML_hdr) \ + gv_perl.cpp $(PERL_hdr) \ + gv_php.cpp $(PHP_hdr) \ + gv_python.cpp $(PYTHON_hdr) \ + gv_ruby.cpp $(RUBY_hdr) \ + gv_tcl.cpp $(TCL_hdr) diff --git a/tclpkg/gv/test.java b/tclpkg/gv/test.java index baa07ea97..0cfcc3a95 100644 --- a/tclpkg/gv/test.java +++ b/tclpkg/gv/test.java @@ -31,7 +31,7 @@ public class test { g = gv.stringgraph("digraph G {a->b}"); gv.rm(g); - g = gv.readgraph("../hello.dot"); + g = gv.readgraph("hello.dot"); gv.layout(g,"dot"); gv.writegraph(g,"hello.png","png"); gv.rm(g); diff --git a/tclpkg/gv/test.php b/tclpkg/gv/test.php index d06a68cb5..07a67af85 100644 --- a/tclpkg/gv/test.php +++ b/tclpkg/gv/test.php @@ -24,7 +24,7 @@ $g = Gv::digraph "G"; #$g = gv::stringgraph "digraph G {a->b}"; #gv::rm $g; # -#$g = gv::readgraph "../hello.dot"; +#$g = gv::readgraph "hello.dot"; #gv::layout($g, "dot"); #gv::writegraph($g, "hello.png", "png"); #gv::rm $g; diff --git a/tclpkg/gv/test.pl b/tclpkg/gv/test.pl index 483587e1c..782821272 100644 --- a/tclpkg/gv/test.pl +++ b/tclpkg/gv/test.pl @@ -22,7 +22,7 @@ gv::rm $g; $g = gv::stringgraph "digraph G {a->b}"; gv::rm $g; -$g = gv::readgraph "../hello.dot"; +$g = gv::readgraph "hello.dot"; gv::layout($g, "dot"); gv::writegraph($g, "hello.png", "png"); gv::rm $g; diff --git a/tclpkg/gv/test.py b/tclpkg/gv/test.py index 0e7760151..03f64bdf1 100644 --- a/tclpkg/gv/test.py +++ b/tclpkg/gv/test.py @@ -22,7 +22,7 @@ gv.rm(g) g = gv.stringgraph("digraph G {a->b}") gv.rm(g) -g = gv.readgraph("../hello.dot") +g = gv.readgraph("hello.dot") gv.layout(g, "dot") gv.writegraph(g, "hello.png", "png") gv.rm(g) diff --git a/tclpkg/gv/test.rb b/tclpkg/gv/test.rb index 533ea65f5..7685d3598 100644 --- a/tclpkg/gv/test.rb +++ b/tclpkg/gv/test.rb @@ -22,7 +22,7 @@ Gv.rm(g) g = Gv.stringgraph("digraph G {a->b}") Gv.rm(g) -g = Gv.readgraph("../hello.dot") +g = Gv.readgraph("hello.dot") Gv.layout(g, "dot") Gv.writegraph(g, "hello.png", "png") Gv.rm(g) diff --git a/tclpkg/gv/test.tcl b/tclpkg/gv/test.tcl index d49098a34..f5c734593 100644 --- a/tclpkg/gv/test.tcl +++ b/tclpkg/gv/test.tcl @@ -23,6 +23,6 @@ gv::rm $g set g [gv::stringgraph "digraph G {a->b}"] gv::rm $g -set g [gv::readgraph ../hello.dot] +set g [gv::readgraph hello.dot] gv::layout $g dot gv::writegraph $g hello.png png -- 2.40.0