From: ellson Date: Fri, 11 Apr 2008 15:05:14 +0000 (+0000) Subject: separate includes for each language binding. X-Git-Tag: LAST_LIBGRAPH~32^2~4333 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=067a3634f2b3efedf6e870488679e17699a877e3;p=graphviz separate includes for each language binding. --- diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am index 06a20a7c8..549a203d8 100644 --- a/tclpkg/gv/Makefile.am +++ b/tclpkg/gv/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/common \ -I$(top_srcdir)/lib/graph \ -I$(top_srcdir)/lib/cdt \ - -I$(top_srcdir)/lib/pathplan $(GUILE_INCLUDES) $(LUA_INCLUDES) $(OCAML_INCLUDES) $(PERL_INCLUDES) $(PHP_INCLUDES) $(PYTHON_INCLUDES) $(R_CFLAGS) $(RUBY_INCLUDES) $(TCL_INCLUDES) + -I$(top_srcdir)/lib/pathplan LIBS = @LIBS@ -lc @@ -24,8 +24,9 @@ pkgsharpdir = $(pkglibdir)/sharp SHARP_data = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_data) libgv_sharp_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_sharp_la_LIBADD = $(BASELIBS) @SHARP_LIBS@ +libgv_sharp_la_LIBADD = $(BASELIBS) $(SHARP_LIBS) libgv_sharp_la_LDFLAGS = -module -avoid-version +libgv_sharp_la_CPPFLAGS = $(AM_CPPFLAGS) $(SHARP_INCLUDES) $(SHARP_data): gv_sharp.cpp gv_sharp.cpp: gv.i $(SWIG) -c++ -csharp -namespace gv -o gv_sharp.cpp $(srcdir)/gv.i @@ -34,8 +35,9 @@ pkgguiledir = $(pkglibdir)/guile GUILE_data = nodist_libgv_guile_la_SOURCES = gv_guile.cpp $(GUILE_data) libgv_guile_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@ +libgv_guile_la_LIBADD = $(BASELIBS) $(GUILE_LIBS) libgv_guile_la_LDFLAGS = -module -avoid-version +libgv_guile_la_CPPFLAGS = $(AM_CPPFLAGS) $(GUILE_INCLUDES) $(GUILE_data): gv_guile.cpp gv_guile.cpp: gv.i $(SWIG) -c++ -guile -o gv_guile.cpp $(srcdir)/gv.i @@ -46,8 +48,9 @@ pkgiodir = $(pkglibdir)/io IO_data = nodist_libgv_io_la_SOURCES = gv_io.cpp $(IO_data) libgv_io_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_io_la_LIBADD = $(BASELIBS) @IO_LIBS@ +libgv_io_la_LIBADD = $(BASELIBS) $(IO_LIBS) libgv_io_la_LDFLAGS = -module -avoid-version +libgv_io_la_CPPFLAGS = $(AM_CPPFLAGS) $(IO_INCLUDES) $(IO_data): gv_io.cpp gv_io.cpp: gv.i $(SWIG) -c++ -io -o gv_io.cpp $(srcdir)/gv.i @@ -56,8 +59,9 @@ pkgjavadir = $(pkglibdir)/java JAVA_data = gv.java gvJNI.java SWIGTYPE_p_Agraph_t.java SWIGTYPE_p_Agnode_t.java SWIGTYPE_p_Agedge_t.java SWIGTYPE_p_Agsym_t.java SWIGTYPE_p_FILE.java nodist_libgv_java_la_SOURCES = gv_java.cpp libgv_java_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@ +libgv_java_la_LIBADD = $(BASELIBS) $(JAVA_LIBS) libgv_java_la_LDFLAGS = -module -avoid-version +libgv_java_la_CPPFLAGS = $(AM_CPPFLAGS) $(JAVA_INCLUDES) $(JAVA_data): gv_java.cpp gv_java.cpp: gv.i $(SWIG) -c++ -java -o gv_java.cpp $(srcdir)/gv.i @@ -66,8 +70,9 @@ pkgluadir = $(pkglibdir)/lua LUA_data = nodist_libgv_lua_la_SOURCES = gv_lua.cpp $(LUA_data) libgv_lua_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@ +libgv_lua_la_LIBADD = $(BASELIBS) $(LUA_LIBS) libgv_lua_la_LDFLAGS = -module -avoid-version +libgv_lua_la_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(LUA_data): gv_lua.cpp gv_lua.cpp: gv.i $(SWIG) -c++ -lua -o gv_lua.cpp $(srcdir)/gv.i @@ -81,6 +86,7 @@ nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_data) libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@ libgv_ocaml_la_LDFLAGS = -module -avoid-version +libgv_ocaml_la_CPPFLAGS = $(AM_CPPFLAGS) $(OCAML_INCLUDES) gv.ml gv.mli: gv_ocaml.cpp gv_ocaml.cpp: gv.i $(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i @@ -108,8 +114,9 @@ pkgperldir = $(pkglibdir)/perl PERL_data = gv.pm nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data) libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@ +libgv_perl_la_LIBADD = $(BASELIBS) $(PERL_LIBS) libgv_perl_la_LDFLAGS = -module -avoid-version +libgv_perl_la_CPPFLAGS = $(AM_CPPFLAGS) $(PERL_INCLUDES) $(PERL_data): gv_perl.cpp gv_perl.cpp: gv.i $(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i @@ -118,8 +125,9 @@ pkgphpdir = $(pkglibdir)/php PHP_data = gv.php nodist_libgv_php_la_SOURCES = gv_php.cpp php_gv.h libgv_php_la_SOURCES = $(BASESOURCES) gv_php_init.cpp -libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@ +libgv_php_la_LIBADD = $(BASELIBS) $(PHP_LIBS) libgv_php_la_LDFLAGS = -module -avoid-version +libgv_php_la_CPPFLAGS = $(AM_CPPFLAGS) $(PHP_INCLUDES) gv.php: gv_php.cpp php_gv.h: gv_php.cpp gv_php.cpp: gv.i @@ -129,8 +137,9 @@ pkgpythondir = $(pkglibdir)/python PYTHON_data = gv.py nodist_libgv_python_la_SOURCES = gv_python.cpp $(PYTHON_data) libgv_python_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@ +libgv_python_la_LIBADD = $(BASELIBS) $(PYTHON_LIBS) libgv_python_la_LDFLAGS = -module -avoid-version +libgv_python_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES) $(PYTHON_data): gv_python.cpp gv_python.cpp: gv.i $(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i @@ -138,27 +147,31 @@ gv_python.cpp: gv.i pkgpython23dir = $(pkglibdir)/python23 nodist_libgv_python23_la_SOURCES = $(nodist_libgv_python_la_SOURCES) libgv_python23_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_python23_la_LIBADD = $(BASELIBS) @PYTHON23_LIBS@ +libgv_python23_la_LIBADD = $(BASELIBS) $(PYTHON23_LIBS) libgv_python23_la_LDFLAGS = -module -avoid-version +libgv_python23_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON23_INCLUDES) pkgpython24dir = $(pkglibdir)/python24 nodist_libgv_python24_la_SOURCES = $(nodist_libgv_python_la_SOURCES) libgv_python24_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_python24_la_LIBADD = $(BASELIBS) @PYTHON24_LIBS@ +libgv_python24_la_LIBADD = $(BASELIBS) $(PYTHON24_LIBS) libgv_python24_la_LDFLAGS = -module -avoid-version +libgv_python24_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON24_INCLUDES) pkgpython25dir = $(pkglibdir)/python25 nodist_libgv_python25_la_SOURCES = $(nodist_libgv_python_la_SOURCES) libgv_python25_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_python25_la_LIBADD = $(BASELIBS) @PYTHON25_LIBS@ +libgv_python25_la_LIBADD = $(BASELIBS) $(PYTHON25_LIBS) libgv_python25_la_LDFLAGS = -module -avoid-version +libgv_python25_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON25_INCLUDES) pkgRdir = $(pkglibdir)/R R_data = nodist_libgv_R_la_SOURCES = gv_R.cpp $(R_data) libgv_R_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_R_la_LIBADD = $(BASELIBS) @R_LIBS@ +libgv_R_la_LIBADD = $(BASELIBS) $(R_LIBS) libgv_R_la_LDFLAGS = -module -avoid-version +libgv_R_la_CPPFLAGS = $(AM_CPPFLAGS) $(R_CFLAGS) $(R_data): gv_R.cpp gv_R.cpp: gv.i $(SWIG) -c++ -r -o gv_R.cpp $(srcdir)/gv.i @@ -167,8 +180,9 @@ pkgrubydir = $(pkglibdir)/ruby RUBY_data = nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_data) libgv_ruby_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@ +libgv_ruby_la_LIBADD = $(BASELIBS) $(RUBY_LIBS) libgv_ruby_la_LDFLAGS = -module -avoid-version +libgv_ruby_la_CPPFLAGS = $(AM_CPPFLAGS) $(RUBY_INCLUDES) $(RUBY_data): gv_ruby.cpp gv_ruby.cpp: gv.i $(SWIG) -c++ -ruby -o gv_ruby.cpp $(srcdir)/gv.i @@ -177,8 +191,9 @@ pkgtcldir = $(pkglibdir)/tcl TCL_data = nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_data) libgv_tcl_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp -libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) @TCL_LIBS@ +libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) $(TCL_LIBS) libgv_tcl_la_LDFLAGS = -module -avoid-version +libgv_tcl_la_CPPFLAGS = $(AM_CPPFLAGS) $(TCL_INCLUDES) $(TCL_data): gv_tcl.cpp gv_tcl.cpp: gv.i $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i