summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/util
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2009-10-12 04:46:21 -0700
committerSteven Noonan <steven@uplinklabs.net>2009-10-12 04:46:21 -0700
commit9c13afce9a3c0eb0e7cd5ffdcf7ead4b711812c8 (patch)
tree98b351d1fe20b6eaa0d7855019b3ffe1613d43fd /crawl-ref/source/util
parent2dcd1edb5e6e43b844b095de43a60c4df7ff8254 (diff)
downloadcrawl-ref-9c13afce9a3c0eb0e7cd5ffdcf7ead4b711812c8.tar.gz
crawl-ref-9c13afce9a3c0eb0e7cd5ffdcf7ead4b711812c8.zip
makefiles: set up global vs. local cflags, optimize sqlite build
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/util')
-rw-r--r--crawl-ref/source/util/lua/src/Makefile2
-rw-r--r--crawl-ref/source/util/sqlite/Makefile3
2 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/util/lua/src/Makefile b/crawl-ref/source/util/lua/src/Makefile
index 8460bb7f67..c67263f4f9 100644
--- a/crawl-ref/source/util/lua/src/Makefile
+++ b/crawl-ref/source/util/lua/src/Makefile
@@ -19,7 +19,7 @@ endif
endif
CC ?= gcc
-CFLAGS = -O2 -Wall $(MYCFLAGS)
+CFLAGS ?= -O2 -Wall
AR = ar rcu
RANLIB = ranlib
RM = rm -f
diff --git a/crawl-ref/source/util/sqlite/Makefile b/crawl-ref/source/util/sqlite/Makefile
index ab7b00d8e0..4b9886a2d9 100644
--- a/crawl-ref/source/util/sqlite/Makefile
+++ b/crawl-ref/source/util/sqlite/Makefile
@@ -15,7 +15,8 @@ RANLIB = ranlib
RM_F = rm -f
# Omit SQLite features we don't need.
-CFLAGS = -DSQLITE_OMIT_AUTHORIZATION \
+CFLAGS ?= -O2
+CFLAGS +=-DSQLITE_OMIT_AUTHORIZATION \
-DSQLITE_OMIT_AUTOVACUUM \
-DSQLITE_OMIT_COMPLETE \
-DSQLITE_OMIT_BLOB_LITERAL \