X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=base%2Fcommon.make;h=b0d4bae8bc4e251b21dc6093f437726d58dd8bdf;hb=f5ec8a394c47baf605e403b0b3c6709db824bdcf;hp=a71574786383e0d4e93395310d11f8b23d19b3f2;hpb=5dca360f2da544c9b6baf9d18ad8cd0b0e073e60;p=chiark-tcl.git

diff --git a/base/common.make b/base/common.make
index a715747..b0d4bae 100644
--- 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,28 +12,33 @@
 # 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.4
+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)