test-load targets: Use strip to sanitise whitespace in OTHER_DIRS so that the subst...

[chiark-tcl.git] / base / extension.make

diff --git a/base/extension.make b/base/extension.make
index d03cb286fea34d9d7b8a866e1424f05e320a56ce..4da0272b0aac6365ffb0502829d337d4cebc0553 100644 (file)
--- a/base/extension.make
+++ b/base/extension.make
@@ -1,3 +1,20 @@
+# base code for various Tcl extensions
+# Copyright 2006-2012 Ian Jackson
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, see <http://www.gnu.org/licenses/>.
+
+
 
 EXTPREFIX ?=   $(FAMILY)_
 EXTENSION ?=   $(EXTPREFIX)$(EXTBASE)
@@ -24,4 +41,18 @@ TCMDIFARGS ?=        -p$(FAMILY)_$(EXTBASE) -o$@ $(BASE_TCT) $(OTHER_TCTS) $<
 %+tcmdif.h:    %.tct $(BASE_TCT) $(OTHER_TCTS) $(TCMDIFGEN)
                $(TCMDIFGEN) -wh $(TCMDIFARGS)
 
+OTHER_DIRS +=  ../base/
+OTHER_DIRS +=  $(addprefix ../,$(dir $(OTHER_EXTS)))
+OTHER_DIRS +=  .
+
+null :=
+space := $(null) #
+
+$(SHLIB).test.tcl:
+               echo >$@ "load $(SHLIB).so"
+
+test-load:     $(SHLIB).so $(SHLIB).test.tcl
+               LD_LIBRARY_PATH=$(subst $(space),:,$(strip $(OTHER_DIRS)))$${LD_LIBRARY_PATH+:}$${LD_LIBRARY_PATH} \
+               tclsh$(TCL_VERSION) $(SHLIB).test.tcl
+
 include                $(BASE_DIR)/final.make