Thread: [brlcad-commits] CVS: brlcad/src/librtserver Makefile.am, 14.13, 14.14
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: Sean M. <br...@us...> - 2007-03-02 21:50:35
|
Update of /cvsroot/brlcad/brlcad/src/librtserver In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2903/src/librtserver Modified Files: Makefile.am Log Message: upgrade tcl/tk from 8.4.6 to 8.5a5; also move to a recursive configure, using AC_CONFIG_SUBDIRS to call upon tcl, tk, and enigma's configure scripts as needed instead of redoing their build systems for our purpose. this has a rather drastic impact on the way the libraries are linked together, including the need to compile tcl/tk static so as to avoid libtool portability issues as well as letting us take advantage of their build system for reduced maintenance and easing future upgrades. undoubtedly more build issues to be worked out with other platforms given the extent of this change. this does move us one step closer towards correctly linking against system tcl/tk installations too. Index: Makefile.am =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/librtserver/Makefile.am,v retrieving revision 14.13 retrieving revision 14.14 diff -w -u -r14.13 -r14.14 --- Makefile.am 7 Feb 2007 20:30:35 -0000 14.13 +++ Makefile.am 2 Mar 2007 21:46:27 -0000 14.14 @@ -15,24 +15,18 @@ librtserver_la_LDFLAGS = -version-info ${LIBRTSERVER_VERSION} ${JAVA_LDFLAGS} -module -if BUILD_TCL -TCL_NIL = $(top_builddir)/src/other/libtcl/libtcl_nil.la -else !BUILD_TCL -TCL_NIL = ${TCL} -endif - if BUILD_OPENNURBS -ONLIB = ${OPENNURBS} +ON_NIL = $(top_builddir)/src/other/openNURBS/libopenNURBS_nil.la else -ONLIB = +ON_NIL = endif librtserver_la_LIBADD = \ $(top_builddir)/src/librt/librt_nil.la \ $(top_builddir)/src/libbn/libbn_nil.la \ $(top_builddir)/src/libbu/libbu_nil.la \ - ${TCL_NIL} \ - ${ONLIB} + ${ON_NIL} \ + ${TCL} EXTRA_PROGRAMS = rtserverTest |