chiark
/
gitweb
/
~ian
/
chiark-tcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix unused vars
[chiark-tcl.git]
/
base
/
common.make
diff --git
a/base/common.make
b/base/common.make
index d5db198ec7288828869827489d22eb1de6df339e..b0d4bae8bc4e251b21dc6093f437726d58dd8bdf 100644
(file)
--- a/
base/common.make
+++ b/
base/common.make
@@
-1,5
+1,5
@@
# base code for various Tcl extensions
# 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
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@
-12,13
+12,13
@@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# 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
VERSION ?= 1
FAMILY ?= chiark_tcl
+TCL_VERSION ?= 8.4
+TCL_INCLUDEDIR ?= /usr/include/tcl$(TCL_VERSION)
OPTIMISE ?= -O2
TCL_MEM_DEBUG ?= -DTCL_MEM_DEBUG
OPTIMISE ?= -O2
TCL_MEM_DEBUG ?= -DTCL_MEM_DEBUG
@@
-27,13
+27,18
@@
TCMDIFGEN ?= $(BASE_DIR)/tcmdifgen
BASE_TCT ?= $(BASE_DIR)/base.tct
BASE_SHLIB ?= lib$(FAMILY)-$(VERSION)
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-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)
CPPFLAGS += $(TCL_MEM_DEBUG)
AUTOS += $(AUTO_SRCS) $(AUTO_HDRS)