yes, %BuildRequires swig (and automake conditionals suck!)

diff --git a/graphviz.spec.in b/graphviz.spec.in
index ab86fd18a55cd5fec7fa0eb66e073b93fad5545b..fd81da8b15be481dc8c3f462e8cb357d97fe2d42 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -20,7 +20,7 @@ Source:               http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-@VERSION@.tar.gz
 
 BuildRoot:     %{_tmppath}/%{name}-root
 BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2
-BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3
+BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig
 BuildRequires: /usr/include/tcl.h /usr/include/tk.h
 %{?fc5:BuildRequires: fontconfig-devel xorg-x11-devel libtool-ltdl-devel} 
 %{?fc4:BuildRequires: fontconfig-devel xorg-x11-devel libtool-ltdl-devel} 

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 58d0f5ebc9ad901a5e061089e1ed8e208cd89514..62898ee18a5f4a830a98440830aefe92ece3dea7 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -12,86 +12,75 @@ LIBS =  @LIBS@ -lc
 
 BASELIBS =  $(top_builddir)/lib/gvc/libgvc.la
 
-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.lo gv_csharp.lo
-libgv_csharp_la_LIBADD = gv_csharp.lo $(BASELIBS) @CSHARP_LIBS@ 
-gv_csharp.cpp $(CSHARP_hdr): gv.i
-       $(SWIG) -c++ -csharp -namespace gv -o gv_csharp.cpp gv.i
-
-GUILE_hdr = 
-libgv_guile_la_SOURCES = gv.cpp 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_hdr = 
-libgv_io_la_SOURCES = gv.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
+#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_csharp.cpp
+#libgv_csharp_la_LIBADD = $(BASELIBS) @CSHARP_LIBS@ 
+#gv_csharp.cpp $(CSHARP_hdr): gv.i
+#      $(SWIG) -c++ -csharp -namespace gv -o gv_csharp.cpp gv.i
+
+#GUILE_hdr = 
+#libgv_guile_la_SOURCES = gv.cpp gv.gv_guile.cpp
+#libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
+#gv_guile.cpp $(GUILE_hdr): gv.i
+#      $(SWIG) -c++ -guile -o gv_guile.cpp gv.i
+
+#IO_hdr = 
+#libgv_io_la_SOURCES = gv.cpp gv_io.cpp
+#libgv_io_la_LIBADD = $(BASELIBS) @IO_LIBS@
+#gv_io.cpp $(IO_hdr): gv.i
+#      $(SWIG) -c++ -io -o gv_io.cpp gv.i
 
 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.lo gv_java.lo
-libgv_java_la_LIBADD = gv_java.lo $(BASELIBS) @JAVA_LIBS@
+libgv_java_la_SOURCES = gv.cpp gv_java.cpp
+libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@
 gv_java.cpp $(JAVA_hdr): gv.i
        $(SWIG) -c++ -java -o gv_java.cpp gv.i
 
-OCAML_hdr = gv.ml gv.mli
-libgv_ocaml_la_SOURCES = gv.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
+#OCAML_hdr = gv.ml gv.mli
+#libgv_ocaml_la_SOURCES = gv.cpp gv_ocaml.cpp
+#libgv_ocaml_la_LIBADD = $(BASELIBS) @IO_LIBS@
+#gv_ocaml.cpp $(OCAML_hdr): gv.i
+#      $(SWIG) -c++ -ocaml -o gv_ocaml.cpp gv.i
 
 PERL_hdr = gv.pm
-libgv_perl_la_SOURCES = gv.cpp gv.i
-libgv_perl_la_DEPENDENCIES = gv.lo gv_perl.lo
-libgv_perl_la_LIBADD = gv_perl.lo $(BASELIBS) @PERL_LIBS@
+libgv_perl_la_SOURCES = gv.cpp gv_perl.cpp
+libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
 gv_perl.cpp $(PERL_hdr): gv.i
        $(SWIG) -c++ -perl -o gv_perl.cpp gv.i
 
 PHP_hdr = gv.php php_gv.h
-libgv_php_la_SOURCES = gv.cpp gv.i
-libgv_php_la_DEPENDENCIES = gv.lo gv_php.lo
-libgv_php_la_LIBADD = gv_php.lo $(BASELIBS) @PHP_LIBS@
+libgv_php_la_SOURCES = gv.cpp gv_php.cpp
+libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
 gv_php.cpp $(PHP_hdr): gv.i
        $(SWIG) -c++ -php -o gv_php.cpp gv.i
 
 PYTHON_hdr = gv.py
-libgv_python_la_SOURCES = gv.cpp gv.i
-libgv_python_la_DEPENDENCIES = gv.lo gv_python.lo
-libgv_python_la_LIBADD = gv_python.lo $(BASELIBS) @PYTHON_LIBS@
+libgv_python_la_SOURCES = gv.cpp gv_python.cpp
+libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@
 gv_python.cpp $(PYTHON_hdr): gv.i
        $(SWIG) -c++ -python -o gv_python.cpp gv.i
 
 RUBY_hdr = 
-libgv_ruby_la_SOURCES = gv.cpp gv.i
-libgv_ruby_la_DEPENDENCIES = gv.lo gv_ruby.lo
-libgv_ruby_la_LIBADD = gv_ruby.lo $(BASELIBS) @RUBY_LIBS@
+libgv_ruby_la_SOURCES = gv.cpp gv_ruby.cpp
+libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@
 gv_ruby.cpp $(RUBY_hdr): gv.i
        $(SWIG) -c++ -ruby -o gv_ruby.cpp gv.i
 
 TCL_hdr = 
-libgv_tcl_la_SOURCES = gv.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@
+libgv_tcl_la_SOURCES = gv.cpp gv_tcl.cpp
+libgv_tcl_la_LIBADD = $(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
 pkglib_LTLIBRARIES = 
 TESTS =
 if WITH_SWIG
-if WITH_CSHARP
-pkginclude_DATA += $(CSHARP_hdr)
-pkglib_LTLIBRARIES += libgv_csharp.la
-TESTS += test_csharp
-endif
+#if WITH_CSHARP
+#pkginclude_DATA += $(CSHARP_hdr)
+#pkglib_LTLIBRARIES += libgv_csharp.la
+#TESTS += test_csharp
+#endif
 #if WITH_GUILE
 #pkginclude_DATA += $(GUILE_hdr)
 #pkglib_LTLIBRARIES += libgv_guile.la
@@ -222,8 +211,20 @@ test_tcl: libgv_tcl.la
                ln -fs ../*.dot ../*.tcl .; \
                $(TCLSH) ./test.tcl)
 
-EXTRA_DIST = demo/* 
+EXTRA_DIST = demo/* gv.cpp gv.i \
+       gv_java.cpp $(JAVA_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)
 
+#      gv_csharp.cpp $(CSHARP_hdr) \
+#      gv_guile.cpp $(GUILE_hdr) \
+#      gv_io.cpp $(IO_hdr) \
+#      gv_ocaml.cpp $(OCAML_hdr) \
+#
+#
 CLEANFILES = test_*/*
 
 DISTCLEANFILES = \