@@ -18,6 +18,8 @@

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

diff --git a/base/common.make b/base/common.make
index a71574786383e0d4e93395310d11f8b23d19b3f2..b736610bf3a99445fbc7fe8cd708abfe6cd40c15 100644 (file)
--- a/base/common.make
+++ b/base/common.make
@@ -19,21 +19,28 @@
 
 VERSION ?=     1
 FAMILY ?=      chiark_tcl
+TCL_VERSION ?= 8.3
+TCL_INCLUDEDIR ?= /usr/include/tcl$(TCL_VERSION)
 
 OPTIMISE ?=            -O2
 TCL_MEM_DEBUG ?=       -DTCL_MEM_DEBUG
 
 TCMDIFGEN ?=   $(BASE_DIR)/tcmdifgen
 BASE_TCT ?=    $(BASE_DIR)/base.tct
-BASE_SHLIB ?=  $(FAMILY)-$(VERSION)
+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
 
-CFLAGS +=      -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror \
-               $(OPTIMISE)
-CPPFLAGS +=    -I$(BASE_DIR)
+ifeq ($(shell $(CC) -fno-strict-aliasing -E -x c /dev/null >/dev/null || echo x),)
+CFLAGS +=      -fno-strict-aliasing
+endif
+
+CPPFLAGS +=    -I$(TCL_INCLUDEDIR) -I$(BASE_DIR)
 CPPFLAGS +=    $(TCL_MEM_DEBUG)
 
 AUTOS +=       $(AUTO_SRCS) $(AUTO_HDRS)