]> granicus.if.org Git - graphviz/commitdiff
install all language bindings in own subdirectories
authorellson <devnull@localhost>
Tue, 18 Oct 2005 21:05:00 +0000 (21:05 +0000)
committerellson <devnull@localhost>
Tue, 18 Oct 2005 21:05:00 +0000 (21:05 +0000)
configure.ac
tclpkg/gdtclft/Makefile.am
tclpkg/gv/Makefile.am
tclpkg/mkpkgindex.sh
tclpkg/tcldot/Makefile.am
tclpkg/tclpathplan/Makefile.am
tclpkg/tkspline/Makefile.am

index 78e3031270af3bde0a68e21571cf0c2e125abcb6..09d58ef359879a94adbbd351445f443f3f1ff445 100644 (file)
@@ -376,9 +376,12 @@ if test "x$OCAML" = "x"; then
   HAVE_OCAML=0
 else
   HAVE_OCAML=1
-  OCAML_INCLUDES=
-  OCAML_LIBS=
+  OCAML_INCLUDES=/usr/lib/ocaml
+  OCAML_LIBS=/usr/lib/ocaml
 fi
+AC_CHECK_HEADER(caml/mlvalues.h,,[
+  AC_MSG_WARN([Unable to find header caml/mlvalues.h. The OCAML packages will not be built])
+  HAVE_OCAML=0])
 AM_CONDITIONAL(WITH_OCAML, [test "x$HAVE_OCAML" = "x1"])
 AC_SUBST(HAVE_OCAML)
 AC_SUBST(OCAML_INCLUDES)
index bc5af07b6acee6e988c5d3874c9c6cc10bc91326..cf795249f339efd9b5276f3386c4a0c6f059877f 100644 (file)
@@ -2,6 +2,9 @@
 
 SUBDIRS = demo
 
+pdfdir = $(pkgdatadir)/doc/pdf
+pkgtcldir = $(pkglibdir)/tcl
+
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
        -I$(top_srcdir)/tclpkg/tclhandle \
@@ -14,10 +17,8 @@ AM_CFLAGS = @TCL_CFLAGS@
 man = gdtclft.n
 pdf = gdtclft.pdf
 
-pdfdir = $(pkgdatadir)/doc/pdf
-
 if WITH_TCL
-pkglib_LTLIBRARIES = libgdtclft.la
+pkgtcl_LTLIBRARIES = libgdtclft.la
 man_MANS = $(man)
 pdf_DATA = $(pdf)
 endif
@@ -26,6 +27,7 @@ libgdtclft_la_SOURCES = gdtclft.c
 libgdtclft_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs.la @GD_LIBS@
+libgdtclft_la_LDFLAGS = -module -version-info @VERSION_INFO@ -no-undefined
 
 if WITH_TCL
 all-local: pkgIndex.tcl
index 114a704a6f0197738c11d32c25218c964d627555..11f5a99983cd11ad33892feb97eb046ea6435c1d 100644 (file)
@@ -14,63 +14,83 @@ BASESOURCES = gv.cpp
 BASELIBS = $(top_builddir)/lib/gvc/libgvc.la
 
 
+#pkgcsharpdir = $(pkglibdir)/csharp
 #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 = $(BASESOURCES) gv_csharp.cpp
 #libgv_csharp_la_LIBADD = $(BASELIBS) @CSHARP_LIBS@ 
+#libgv_csharp_la_LDFLAGS = -module
 #gv_csharp.cpp $(CSHARP_hdr): gv.i
 #      $(SWIG) -c++ -csharp -namespace gv -o gv_csharp.cpp gv.i
 
+#pkgguiledir = $(pkglibdir)/guile
 #GUILE_hdr = 
 #libgv_guile_la_SOURCES = $(BASESOURCES) gv.gv_guile.cpp
 #libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
+#libgv_guile_la_LDFLAGS = -module
 #gv_guile.cpp $(GUILE_hdr): gv.i
 #      $(SWIG) -c++ -guile -o gv_guile.cpp gv.i
 
+#pkgiodir = $(pkglibdir)/io
 #IO_hdr = 
 #libgv_io_la_SOURCES = $(BASESOURCES) gv_io.cpp
 #libgv_io_la_LIBADD = $(BASELIBS) @IO_LIBS@
+#libgv_io_la_LDFLAGS = -module
 #gv_io.cpp $(IO_hdr): gv.i
 #      $(SWIG) -c++ -io -o gv_io.cpp gv.i
 
+pkgjavadir = $(pkglibdir)/java
 JAVA_hdr = gv.java gvJNI.java SWIGTYPE_p_Agraph_t.java SWIGTYPE_p_Agnode_t.java SWIGTYPE_p_Agedge_t.java SWIGTYPE_p_Agsym_t.java
 libgv_java_la_SOURCES = $(BASESOURCES) gv_java.cpp
 libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@
+libgv_java_la_LDFLAGS = -module
 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 = $(BASESOURCES) 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
+pkgocamldir = $(pkglibdir)/ocaml
+OCAML_hdr = gv.ml gv.mli
+libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_ocaml.cpp
+libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
+libgv_ocaml_la_LDFLAGS = -module
+gv_ocaml.cpp $(OCAML_hdr): gv.i
+       $(SWIG) -c++ -ocaml -o gv_ocaml.cpp gv.i
 
+pkgperldir = $(pkglibdir)/perl
 PERL_hdr = gv.pm
 libgv_perl_la_SOURCES = $(BASESOURCES) gv_perl.cpp
 libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
+libgv_perl_la_LDFLAGS = -module
 gv_perl.cpp $(PERL_hdr): gv.i
        $(SWIG) -c++ -perl -o gv_perl.cpp gv.i
 
+pkgphpdir = $(pkglibdir)/php
 PHP_hdr = gv.php php_gv.h
 libgv_php_la_SOURCES = $(BASESOURCES) gv_php.cpp
 libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
+libgv_php_la_LDFLAGS = -module
 gv_php.cpp $(PHP_hdr): gv.i
        $(SWIG) -c++ -php -o gv_php.cpp gv.i
 
+pkgpythondir = $(pkglibdir)/python
 PYTHON_hdr = gv.py
-libgv_python_la_SOURCES = $(BASESOURCES) gv_python.cpp
-libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@
+_gv_la_SOURCES = $(BASESOURCES) gv_python.cpp
+_gv_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@
+_gv_la_LDFLAGS = -module
 gv_python.cpp $(PYTHON_hdr): gv.i
        $(SWIG) -c++ -python -o gv_python.cpp gv.i
 
+pkgrubydir = $(pkglibdir)/ruby
 RUBY_hdr = 
 libgv_ruby_la_SOURCES = $(BASESOURCES) gv_ruby.cpp
 libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@
+libgv_ruby_la_LDFLAGS = -module
 gv_ruby.cpp $(RUBY_hdr): gv.i
        $(SWIG) -c++ -ruby -o gv_ruby.cpp gv.i
 
+pkgtcldir = $(pkglibdir)/tcl
 TCL_hdr = 
 libgv_tcl_la_SOURCES = $(BASESOURCES) gv_tcl.cpp
 libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs.la $(BASELIBS) @TCL_LIBS@
+libgv_tcl_la_LDFLAGS = -module
 gv_tcl.cpp $(TCL_hdr): gv.i
        $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp gv.i
 
@@ -79,53 +99,53 @@ pkglib_LTLIBRARIES =
 TESTS =
 if WITH_SWIG
 #if WITH_CSHARP
-#pkginclude_DATA += $(CSHARP_hdr)
-#pkglib_LTLIBRARIES += libgv_csharp.la
+#pkgcsharp_DATA += $(CSHARP_hdr)
+#pkgcsharp_LTLIBRARIES += libgv_csharp.la
 #TESTS += test_csharp
 #endif
 #if WITH_GUILE
-#pkginclude_DATA += $(GUILE_hdr)
-#pkglib_LTLIBRARIES += libgv_guile.la
+#pkgguile_DATA += $(GUILE_hdr)
+#pkgguile_LTLIBRARIES += libgv_guile.la
 #TESTS += test_guile
 #endif
 #if WITH_IO
-#pkginclude_DATA += $(IO_hdr)
-#pkglib_LTLIBRARIES += libgv_io.la
+#pkgio_DATA += $(IO_hdr)
+#pkgio_LTLIBRARIES += libgv_io.la
 #TESTS += test_io
 #endif
 if WITH_JAVA
-pkginclude_DATA += $(JAVA_hdr)
-pkglib_LTLIBRARIES += libgv_java.la
+pkgjava_DATA = $(JAVA_hdr)
+pkgjava_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
+pkgocaml_DATA = $(OCAML_hdr)
+pkgocaml_LTLIBRARIES = libgv_ocaml.la
+TESTS += test_ocaml
+endif
 if WITH_PERL
-pkginclude_DATA += $(PERL_hdr)
-pkglib_LTLIBRARIES += libgv_perl.la
+pkgperl_DATA = $(PERL_hdr)
+pkgperl_LTLIBRARIES = libgv_perl.la
 TESTS += test_perl
 endif
 if WITH_PHP
-pkginclude_DATA += $(PHP_hdr)
-pkglib_LTLIBRARIES += libgv_php.la
+pkgphp_DATA = $(PHP_hdr)
+pkgphp_LTLIBRARIES = libgv_php.la
 TESTS += test_php
 endif
 if WITH_PYTHON
-pkginclude_DATA += $(PYTHON_hdr)
-pkglib_LTLIBRARIES += libgv_python.la
+pkgpython_DATA = $(PYTHON_hdr)
+pkgpython_LTLIBRARIES = _gv.la
 TESTS += test_python
 endif
 if WITH_RUBY
-pkginclude_DATA += $(RUBY_hdr)
-pkglib_LTLIBRARIES += libgv_ruby.la
+pkgruby_DATA = $(RUBY_hdr)
+pkgruby_LTLIBRARIES = libgv_ruby.la
 TESTS += test_ruby
 endif
 if WITH_TCL
-pkginclude_DATA += $(TCL_hdr)
-pkglib_LTLIBRARIES += libgv_tcl.la
+pkgtcl_DATA = $(TCL_hdr)
+pkgtcl_LTLIBRARIES = libgv_tcl.la
 TESTS += test_tcl
 endif
 endif
@@ -193,10 +213,9 @@ test_php: libgv_php.la
                $(PHP) ./test.php)
 
 .PHONY: test_python
-test_python: libgv_python.la
+test_python: _gv.la
        -(mkdir -p test_python; cd test_python; \
-               ln -fs ../.libs/libgv_python.so _gv.so; \
-               ln -fs ../*.dot ../*.py .; \
+               ln -fs ../.libs/_gv.so ../*.dot ../*.py .; \
                PYTHONPATH=. $(PYTHON) test.py)
 
 .PHONY: test_ruby
index 1144f5565053d2ff19c9426c216b3327aabd2851..6c6ef6d51b8eec0541a9172c42bf4520f9cb68db 100755 (executable)
@@ -11,4 +11,4 @@ case "$1" in
     echo "     package require Tk 8.3" >>pkgIndex.tcl
     ;;
 esac
-echo " load [file join \$dir $lib] $2\"" >>pkgIndex.tcl
+echo " load [file join \$dir tcl $lib] $2\"" >>pkgIndex.tcl
index 287a0d6529366972f5e010863da2f04e0149592a..59cc40b7e972f0360ec7e58a26f5403dd890485b 100644 (file)
@@ -5,6 +5,8 @@ SUBDIRS = demo
 pdfdir = $(pkgdatadir)/doc/pdf
 htmldir = $(pkgdatadir)/doc/html
 
+pkgtcldir = $(pkglibdir)/tcl
+
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
        -I$(top_srcdir)/lib/gvc \
@@ -24,21 +26,18 @@ html = tcldot.html
 
 noinst_HEADERS = tcldot.h
 if WITH_TCL
-pkglib_LTLIBRARIES = libtcldot.la
+pkgtcl_LTLIBRARIES = libtcldot.la
 man_MANS = $(man)
 pdf_DATA = $(pdf)
 html_DATA = $(html)
 endif
 
-# need to align pkgIndex.tcl
-#libtcldot_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-
 libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/tclpkg/gdtclft/gdtclft.c
-
 libtcldot_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs.la \
        $(top_builddir)/lib/gvc/libgvc.la @LIBGEN_LIBS@ @LIBLTDL@
+libtcldot_la_LDFLAGS = -module -version-info @VERSION_INFO@ -no-undefined
 
 if WITH_TCL
 all-local: pkgIndex.tcl
index 88b81ca55ca2f918947a6ad7c1d4416c6a05667f..f03f4b340df9338d941db724e833f12cbcf8728f 100644 (file)
@@ -2,6 +2,8 @@
 
 SUBDIRS = demo
 
+pkgtcldir = $(pkglibdir)/tcl
+
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/tclpkg/tclhandle \
@@ -11,15 +13,15 @@ AM_CFLAGS = @TCL_CFLAGS@
 
 noinst_HEADERS = simple.h
 if WITH_TCL
-pkglib_LTLIBRARIES = libtclplan.la
+pkgtcl_LTLIBRARIES = libtclplan.la
 endif
 
 libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c tclpathplan.c wrapper.c
-
 libtclplan_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs.la \
        $(top_builddir)/lib/pathplan/libpathplan.la
+libtclplan_la_LDFLAGS = -module -version-info @VERSION_INFO@ -no-undefined
 
 if WITH_TCL
 all-local: pkgIndex.tcl
index 846795ffcb23fa1361606430afa2ae644b7988ff..6868c669b10a7eb75ef115528413b230436cdd5d 100644 (file)
@@ -2,6 +2,7 @@
 
 SUBDIRS = demo
 
+pkgtcldir = $(pkglibdir)/tcl
 pdfdir = $(pkgdatadir)/doc/pdf
 
 man = tkspline.n
@@ -17,7 +18,7 @@ AM_CFLAGS = @X_CFLAGS@ @TCL_CFLAGS@  @TK_CFLAGS@ @TK_DEFS@ \
        -UPACKAGE_NAME -UPACKAGE_STRING -UPACKAGE_TARNAME -UPACKAGE_VERSION
 
 if WITH_TK
-pkglib_LTLIBRARIES = libtkspline.la
+pkgtcl_LTLIBRARIES = libtkspline.la
 man_MANS = $(man)
 pdf_DATA = $(pdf)
 endif
@@ -26,6 +27,7 @@ libtkspline_la_SOURCES = tkspline.c
 libtkspline_la_LIBADD = \
        $(top_builddir)/tclpkg/tkstubs/libtkstubs.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs.la 
+libtkspline_la_LDFLAGS = -module -version-info @VERSION_INFO@ -no-undefined
 
 if WITH_TK
 all-local: pkgIndex.tcl