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

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

diff --git a/base/common.make b/base/common.make
index 2761b4ba8ad9cae880fe2d2b4c45cbd0ff117a2e..d914b5144149d0c1c48d75946b67d4a5dfb2f2b7 100644 (file)
--- a/base/common.make
+++ b/base/common.make
@@ -1,5 +1,5 @@
 # base code for various Tcl extensions
-# Copyright 2006 Ian Jackson
+# 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
@@ -12,14 +12,12 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 
 VERSION ?=     1
 FAMILY ?=      chiark_tcl
-TCL_VERSION ?= 8.3
+TCL_VERSION ?= 8.5
 TCL_INCLUDEDIR ?= /usr/include/tcl$(TCL_VERSION)
 
 OPTIMISE ?=            -O2
@@ -29,16 +27,17 @@ TCMDIFGEN ?=        $(BASE_DIR)/tcmdifgen
 BASE_TCT ?=    $(BASE_DIR)/base.tct
 BASE_SHLIB ?=  lib$(FAMILY)-$(VERSION)
 
+CFLAGS +=      -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror \
+               $(OPTIMISE)
+
 ifeq ($(shell $(CC) -Wno-pointer-sign -E -x c /dev/null >/dev/null || echo x),)
 CFLAGS +=      -Wno-pointer-sign
 endif
 
-ifeq ($(shell $(CC) -Wno-strict-aliasing -E -x c /dev/null >/dev/null || echo x),)
-CFLAGS +=      -Wno-strict-aliasing
+ifeq ($(shell $(CC) -fno-strict-aliasing -E -x c /dev/null >/dev/null || echo x),)
+CFLAGS +=      -fno-strict-aliasing
 endif
 
-CFLAGS +=      -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror \
-               $(OPTIMISE)
 CPPFLAGS +=    -I$(TCL_INCLUDEDIR) -I$(BASE_DIR)
 CPPFLAGS +=    $(TCL_MEM_DEBUG)