still trying to fix some packaging issues

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 45167569d0bd1f7e042ca533be0d8b1b67122a5b..75663a661ccb57eb25c446b4b3a114e07985b1a9 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -15,7 +15,7 @@ Vendor:         http://www.graphviz.org/
 # norootforbuild
 # neededforbuild  expat freetype2 freetype2-devel gcc libjpeg libpng-devel-packages tcl tcl-devel tk tk-devel x-devel-packages
 
-BuildRequires: /bin/ksh ghostscript
+BuildRequires: /bin/ksh groff ghostscript
 BuildRequires: tcl >= 0:8.3 tk expat expat-devel freetype >= 2 freetype-devel
 Buildrequires: libjpeg libjpeg-devel libpng libpng-devel zlib zlib-devel
 %{?fc4:BuildRequires: fontconfig fontconfig-devel tcl-devel tk-devel xorg-x11-devel} 

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index f8fcfa20183d6dcd80bea3196b6aa66e52efe8de..ad98f696f07aed0f03c961f6b22c0b4e6a4ee292 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -13,7 +13,8 @@ LIBS =  @LIBS@ -lc
 if DISABLE_GVRENDER
 BASELIBS = \
        $(top_builddir)/lib/common/libcommon.la \
-       $(top_builddir)/lib/gvc/libgvc.la @LIBGEN_LIBS@
+       $(top_builddir)/lib/gvc/libgvc.la \
+       $(top_builddir)/plugin/layout/libgvplugin_layout.la @LIBGEN_LIBS@
 else
 BASELIBS = \
        $(top_builddir)/lib/common/libcommon.la \
@@ -26,17 +27,7 @@ endif
 
 noinst_HEADERS = gv.h
 
-pkglib_DATA =
-pkglib_DATA += \
-       java/SWIGTYPE_p_Agraph_t.java \
-       java/SWIGTYPE_p_Agnode_t.java \
-       java/SWIGTYPE_p_Agedge_t.java \
-       java/gv.java java/gvJNI.java
-pkglib_DATA += perl/gv.pm
-pkglib_DATA += python/gv.py
-
 pkglib_LTLIBRARIES = 
-if WITH_SWIG
 if WITH_JAVA
 pkglib_LTLIBRARIES += libgv_java.la
 endif
@@ -52,7 +43,6 @@ endif
 if WITH_TCL
 pkglib_LTLIBRARIES += libgv_tcl.la
 endif
-endif
 
 libgv_java_la_SOURCES = gv.cpp gv_java.cpp plugins.c 
 libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@
@@ -69,27 +59,26 @@ libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@
 libgv_tcl_la_SOURCES = gv.cpp gv_tcl.cpp plugins.c 
 libgv_tcl_la_LIBADD = $(BASELIBS) @TCL_LIBS@
 
-java/SWIGTYPE_p_Agraph_t.java \
-java/SWIGTYPE_p_Agnode_t.java \
-java/SWIGTYPE_p_Agedge_t.java \
-java/gv.java java/gvJNI.java \
 gv_java.cpp: gv.i
-       $(SWIG) -c++ -java -outdir java -o gv_java.cpp gv.i
+       $(SWIG) -c++ -java -o gv_java.cpp gv.i
 
-perl/gv.pm \
 gv_perl.cpp: gv.i
-       $(SWIG) -c++ -perl -outdir perl -o gv_perl.cpp gv.i
+       $(SWIG) -c++ -perl -o gv_perl.cpp gv.i
 
-python/gv.py \
 gv_python.cpp: gv.i
-       $(SWIG) -c++ -python -outdir python -o gv_python.cpp gv.i
+       $(SWIG) -c++ -python -o gv_python.cpp gv.i
 
 gv_ruby.cpp: gv.i
-       $(SWIG) -c++ -ruby -outdir ruby -o gv_ruby.cpp gv.i
+       $(SWIG) -c++ -ruby -o gv_ruby.cpp gv.i
 
 gv_tcl.cpp: gv.i
-       $(SWIG) -c++ -tcl -namespace -outdir tcl -o gv_tcl.cpp gv.i
+       $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp gv.i
 
+install-exec-hook:
+       cp $(top_srcdir)/tclpkg/gv/*.java $(DESTDIR)/$(libdir)/@PACKAGE@/
+       cp $(top_srcdir)/tclpkg/gv/*.pm $(DESTDIR)/$(libdir)/@PACKAGE@/
+       cp $(top_srcdir)/tclpkg/gv/*.py $(DESTDIR)/$(libdir)/@PACKAGE@/
+       
 if WITH_TCL
 all-local: pkgIndex.tcl
 
@@ -99,52 +88,47 @@ endif
 
 test: test_java test_perl test_python test_ruby test_tcl
 
-test_java:
+test_java: libgv_java.la
        (cd java; \
                ln -fs ../.libs/libgv_java.so libgv.so; \
+               cp -f ../*.java .; \
                javac *.java; \
                LD_LIBRARY_PATH=. java test)
 
-test_perl:
+test_perl: libgv_perl.la
        (cd perl; \
                ln -fs ../.libs/libgv_perl.so gv.so; \
+               cp -f ../*.pl ../*.pm .; \
                ./test.pl)
 
-test_python:
+test_python: libgv_python.la
        (cd python; \
                ln -fs ../.libs/libgv_python.so _gv.so; \
+               cp -f ../*.py .; \
                PYTHONPATH=. ./test.py)
 
-test_ruby:
+test_ruby: libgv_ruby.la
        (cd ruby; \
                ln -fs ../.libs/libgv_ruby.so gv.so; \
+               cp -f ../*.rb .; \
                ./test.rb)
 
-test_tcl:
+test_tcl: libgv_tcl.la
        (cd tcl; \
                ln -fs ../.libs/libgv_tcl.so libgv_tcl.so; \
+               cp -f ../*.tcl .; \
                ./test.tcl)
 
 EXTRA_DIST = gv.i \
-       java/test.java 
-       perl/test.pl \
-       python/test.py \
-       ruby/test.rb \
-       tcl/test.tcl \
-        java/SWIGTYPE_p_Agraph_t.java \
-        java/SWIGTYPE_p_Agnode_t.java \
-        java/SWIGTYPE_p_Agedge_t.java \
-        java/gv.java \
-       java/gvJNI.java \
-       perl/gv.pm \
-       python/gv.py
-
-CLEANFILES = gv_java.cpp gv_perl.cpp gv_python.cpp gv_ruby.cpp gv_tcl.cpp \
-       java/SWIG*.java java/gv*.java java/*.class java/*.so \
-       java/*.dot java/*.png \
+       SWIGTYPE_p_Agraph_t.java SWIGTYPE_p_Agnode_t.java SWIGTYPE_p_Agedge_t.java \
+       gv.java gvJNI.java gv.pm gv.py
+       
+
+CLEANFILES = java/*.dot java/*.png java/SWIG*.java java/gv*.java java/*.class java/*.so \
        perl/gv.pm perl/gv.so perl/*.dot perl/*.png \
        python/gv.py python/gv.pyc python/_gv.so python/*.dot python/*.png \
        ruby/gv.so ruby/*.dot ruby/*.png \
        tcl/libgv_tcl.so tcl/*.dot tcl/*.png pkgIndex.tcl
 
-DISTCLEANFILES =
+DISTCLEANFILES = gv_java.cpp gv_perl.cpp gv_python.cpp gv_ruby.cpp gv_tcl.cpp \
+       SWIG*.java gv.java gvJNI.java gv.pm gv.py

diff --git a/tclpkg/gv/plugins.c b/tclpkg/gv/plugins.c
index 526815f3618effec0f639d921d59559e0c578701..035e34651200fd4dda59f015937624b740ba2c50 100644 (file)
--- a/tclpkg/gv/plugins.c
+++ b/tclpkg/gv/plugins.c
@@ -21,15 +21,19 @@
 #include        "macros.h"
 #include        "gvc.h"
 
+#ifndef DISABLE_GVRENDER
 extern gvplugin_t gvplugin_cairo_LTX_plugin,
     gvplugin_gd_LTX_plugin,
-    gvplugin_text_LTX_plugin,
-    gvplugin_layout_LTX_plugin;
+    gvplugin_text_LTX_plugin;
+#endif
+extern gvplugin_t gvplugin_layout_LTX_plugin;
 
 gvplugin_t *builtins[] = {
+#ifndef DISABLE_GVRENDER
     &gvplugin_cairo_LTX_plugin,
     &gvplugin_gd_LTX_plugin,
     &gvplugin_text_LTX_plugin,
+#endif
     &gvplugin_layout_LTX_plugin,
     NULL
 };