1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250
|
From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Date: Sat, 26 Jan 2013 06:09:28 +0100
Subject: makefile
---
src/makefile | 9 +++++----
src/sim/makefile | 4 +++-
src/tcl/makefile | 9 +++++----
src/tclx/config.mk | 3 +--
src/tclx/makefile | 15 +++++++++------
src/tclx/ossupp/makefile | 5 +++--
src/tclx/ossupp/makefile.dvx | 3 ++-
src/tclx/src/makefile | 3 ++-
src/tclx/tksrc/makefile | 3 ++-
src/tclx/tkucbsrc/makefile | 5 ++++-
src/tclx/ucbsrc/makefile | 5 +++--
src/tk/makefile | 9 ++++-----
12 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/src/makefile b/src/makefile
index 57217b1..adece4b 100644
--- a/src/makefile
+++ b/src/makefile
@@ -60,6 +60,7 @@
# NOT APPLY TO YOU.
RES = ../res
+OPTFLAGS = -O2 -Wall -g
TARFILES = \
micropolis-activity/Micropolis \
@@ -75,10 +76,10 @@ TARFILES = \
micropolis-activity/Micropolis.png
all:
- cd tcl ; make all
- cd tk ; make all
- cd tclx ; make all
- cd sim ; make all
+ cd tcl ; make OPTFLAGS="$(OPTFLAGS)" all
+ cd tk ; make OPTFLAGS="$(OPTFLAGS)" all
+ cd tclx ; make OPTFLAGS="$(OPTFLAGS)" all
+ cd sim ; make OPTFLAGS="$(OPTFLAGS)" all
clean:
rm -f Micropolis.tgz
diff --git a/src/sim/makefile b/src/sim/makefile
index bdf5847..a09c6f5 100644
--- a/src/sim/makefile
+++ b/src/sim/makefile
@@ -23,10 +23,12 @@ OPTFLAGS = -O3
DEFINES = -DIS_LINUX -DORIGINAL_MONSTER_BEHAVIOUR #-DNO_AIRCRASH
CFLAGS += $(OPTFLAGS) $(DEFINES) -Wall
+OPTFLAGS += `dpkg-buildflags --get CFLAGS`
+OPTFLAGS += `dpkg-buildflags --get CPPFLAGS`
#LDFLAGS = -Bstatic
LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib
-
+LDFLAGS += `dpkg-buildflags --get LDFLAGS`
INSTALL = install -s
INCLUDES = \
diff --git a/src/tcl/makefile b/src/tcl/makefile
index 006b435..d38642e 100644
--- a/src/tcl/makefile
+++ b/src/tcl/makefile
@@ -24,10 +24,11 @@
TCL_LIBRARY = /usr/local/lib/tcl
-CC = gcc
-
-CFLAGS = -O3 -I. -DTCL_LIBRARY=\"${TCL_LIBRARY}\" -DIS_LINUX
-#CFLAGS = -g -I. -DTCL_LIBRARY=\"${TCL_LIBRARY}\" -DIS_LINUX
+CC = gcc
+OPTFLAGS = -O3
+CFLAGS = $(OPTFLAGS) -I. -DTCL_LIBRARY=\"${TCL_LIBRARY}\" -DIS_LINUX
+CFLAGS += `dpkg-buildflags --get CFLAGS`
+CFLAGS += `dpkg-buildflags --get CPPFLAGS`
GENERIC_OBJS = \
regexp.o \
diff --git a/src/tclx/config.mk b/src/tclx/config.mk
index 69ca791..985e3c1 100644
--- a/src/tclx/config.mk
+++ b/src/tclx/config.mk
@@ -62,8 +62,7 @@ XPM_LIBS=-L/usr/X11R6/lib -lXpm
#CC=gcc
-OPTIMIZE_FLAG=-O3 -DIS_LINUX
-#OPTIMIZE_FLAG=-g -DIS_LINUX
+TARGET_FLAG=-DIS_LINUX
#------------------------------------------------------------------------------
# Stripping of the final tclshell binary. Specify `true' if the binary is to
diff --git a/src/tclx/makefile b/src/tclx/makefile
index fae1059..6edc158 100644
--- a/src/tclx/makefile
+++ b/src/tclx/makefile
@@ -30,8 +30,11 @@ SHELL=/bin/sh
MADE.FILES=ucbsrc/made.tmp ossupp/made.tmp src/made.tmp
TKMADE.FILES=tkucbsrc/made.tmp
-CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \
- $(SYS_DEP_FLAGS)
+OPTFLAGS= -O3
+CFLAGS= $(OPTFLAGS) $(TARGET_FLAG) $(XCFLAGS) -I$(TCL_UCB_DIR) \
+ $(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS)
+OPTFLAGS += `dpkg-buildflags --get CFLAGS`
+OPTFLAGS += `dpkg-buildflags --get CPPFLAGS`
#------------------------------------------------------------------------------
@@ -45,10 +48,10 @@ all: tcl tcldef runtcl $(TCL_TK_SHELL)
tcl: TCLX_MAKES
TCLX_MAKES: libtcl.a
- cd ucbsrc; $(MAKE) -$(MAKEFLAGS) all
- cd ossupp; $(MAKE) -$(MAKEFLAGS) all
- cd tclsrc; $(MAKE) -$(MAKEFLAGS) all
- cd src; $(MAKE) -$(MAKEFLAGS) all
+ cd ucbsrc; $(MAKE) OPTFLAGS="$(OPTFLAGS)" -$(MAKEFLAGS) all
+ cd ossupp; $(MAKE) OPTFLAGS="$(OPTFLAGS)" -$(MAKEFLAGS) all
+ cd tclsrc; $(MAKE) OPTFLAGS="$(OPTFLAGS)" -$(MAKEFLAGS) all
+ cd src; $(MAKE) OPTFLAGS="$(OPTFLAGS)" -$(MAKEFLAGS) all
# Copy the UCB libtcl.a file from where it was built. Force the other
diff --git a/src/tclx/ossupp/makefile b/src/tclx/ossupp/makefile
index 5c2ebba..5954911 100644
--- a/src/tclx/ossupp/makefile
+++ b/src/tclx/ossupp/makefile
@@ -22,8 +22,9 @@ SHELL=/bin/sh
#------------------------------------------------------------------------------
-CFLAGS=$(OPTIMIZE_FLAG) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \
- $(SYS_DEP_FLAGS) $(SUPPORT_FLAGS)
+OPTFLAGS=-O3
+CFLAGS=$(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../$(TCL_UCB_DIR) \
+ $(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS) $(SUPPORT_FLAGS)
#------------------------------------------------------------------------------
diff --git a/src/tclx/ossupp/makefile.dvx b/src/tclx/ossupp/makefile.dvx
index da33a95..b2f71c1 100644
--- a/src/tclx/ossupp/makefile.dvx
+++ b/src/tclx/ossupp/makefile.dvx
@@ -22,7 +22,8 @@ include ..\config\$(TCL_CONFIG_FILE)
#------------------------------------------------------------------------------
-CFLAGS=$(OPTIMIZE_FLAG) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \
+OPTFLAGS= -O3
+CFLAGS=$(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \
-DTCL_HAS_TM_ZONE $(SUPPORT_FLAGS)
#------------------------------------------------------------------------------
diff --git a/src/tclx/src/makefile b/src/tclx/src/makefile
index 1484c06..985736b 100644
--- a/src/tclx/src/makefile
+++ b/src/tclx/src/makefile
@@ -25,7 +25,8 @@ SHELL=/bin/sh
#------------------------------------------------------------------------------
-CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \
+OPTFLAGS= -O3
+CFLAGS= $(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \
$(SYS_DEP_FLAGS)
#------------------------------------------------------------------------------
diff --git a/src/tclx/tksrc/makefile b/src/tclx/tksrc/makefile
index 98f4289..3c825d9 100644
--- a/src/tclx/tksrc/makefile
+++ b/src/tclx/tksrc/makefile
@@ -23,7 +23,8 @@ SHELL=/bin/sh
#------------------------------------------------------------------------------
-CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS)
+OPTFLAGS= -O3
+CFLAGS= $(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS)
#------------------------------------------------------------------------------
diff --git a/src/tclx/tkucbsrc/makefile b/src/tclx/tkucbsrc/makefile
index 47f45f9..c8bd174 100644
--- a/src/tclx/tkucbsrc/makefile
+++ b/src/tclx/tkucbsrc/makefile
@@ -23,10 +23,13 @@ SHELL=/bin/sh
#------------------------------------------------------------------------------
-CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I../src -I../$(TCL_TK_DIR) \
+OPTFLAGS= -O3
+CFLAGS= $(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../src -I../$(TCL_TK_DIR) \
-I../$(TCL_UCB_DIR) -I$(XHOME)/include \
$(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS) \
-DTK_VERSION=\"2.2/\"
+OPTFLAGS += `dpkg-buildflags --get CFLAGS`
+OPTFLAGS += `dpkg-buildflags --get CPPFLAGS`
#------------------------------------------------------------------------------
#
diff --git a/src/tclx/ucbsrc/makefile b/src/tclx/ucbsrc/makefile
index 5e79621..0007507 100644
--- a/src/tclx/ucbsrc/makefile
+++ b/src/tclx/ucbsrc/makefile
@@ -24,8 +24,9 @@ SHELL=/bin/sh
#------------------------------------------------------------------------------
-CFLAGS=$(OPTIMIZE_FLAG) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \
- $(SYS_DEP_FLAGS)
+OPTFLAGS=-O3
+CFLAGS=$(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../$(TCL_UCB_DIR) \
+ $(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS)
#------------------------------------------------------------------------------
diff --git a/src/tk/makefile b/src/tk/makefile
index 344c37c..1f606d5 100644
--- a/src/tk/makefile
+++ b/src/tk/makefile
@@ -28,17 +28,16 @@
#
CC = gcc
-
-CFLAGS = -I. -I$(XINCLUDE) -I$(TCL_DIR) -O3 -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
-#CFLAGS = -I. -I$(XINCLUDE) -I$(TCL_DIR) -g -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
+OPTFLAGS = -O3
+CFLAGS = $(OPTFLAGS) -I. -I$(XINCLUDE) -I$(TCL_DIR) -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
+OPTFLAGS += `dpkg-buildflags --get CFLAGS`
+OPTFLAGS += `dpkg-buildflags --get CPPFLAGS`
TCL_DIR = ../tcl
XINCLUDE = /usr/include/X11
XLIB = -L/usr/X11R6/lib -lX11 -lXpm
-
LIBS = libtk.a $(TCL_DIR)/libtcl.a
LINKS = $(LIBS)
-
WIDGOBJS = \
tkbutton.o \
tkentry.o \
|