diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-11 02:52:48 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-11 02:59:35 -0700 |
| commit | c3d83c65b910f87cf901652c72ef5ac81d581924 (patch) | |
| tree | de71d1565ac9a2314338dc1d0565ae7a45e61a54 /crawl-ref/source | |
| parent | f4b8d77bc8edb99f66c8cb1b52c50acc385e3cc8 (diff) | |
| download | crawl-ref-c3d83c65b910f87cf901652c72ef5ac81d581924.tar.gz crawl-ref-c3d83c65b910f87cf901652c72ef5ac81d581924.zip | |
makefiles: inherit CC and CXX variables from top-level Makefile
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/makefile | 3 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/makefile.unix | 3 | ||||
| -rw-r--r-- | crawl-ref/source/util/lua/src/Makefile | 12 | ||||
| -rw-r--r-- | crawl-ref/source/util/sqlite/Makefile | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 39e5af50db..37ea19fa61 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -13,6 +13,9 @@ CXX = g++ DELETE = rm -f COPY = cp +export CC +export CXX + # # Platform Detection # diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix index 715b06ed14..095e6c8f30 100644 --- a/crawl-ref/source/rltiles/makefile.unix +++ b/crawl-ref/source/rltiles/makefile.unix @@ -8,7 +8,8 @@ PNG_LIB := $(shell pkg-config libpng --libs) CFLAGS := $(SDL_CFLAGS) $(PNG_INCLUDE) LDFLAGS := $(SDL_LDFLAGS) $(PNGLIB) -lSDL_image -lpng -CXX = g++ +CXX ?= g++ + DELETE = rm -f TOOLDIR := tool diff --git a/crawl-ref/source/util/lua/src/Makefile b/crawl-ref/source/util/lua/src/Makefile index d6cd279837..8460bb7f67 100644 --- a/crawl-ref/source/util/lua/src/Makefile +++ b/crawl-ref/source/util/lua/src/Makefile @@ -18,12 +18,12 @@ ifndef V endif endif -CC= gcc -CFLAGS= -O2 -Wall $(MYCFLAGS) -AR= ar rcu -RANLIB= ranlib -RM= rm -f -LIBS= -lm $(MYLIBS) +CC ?= gcc +CFLAGS = -O2 -Wall $(MYCFLAGS) +AR = ar rcu +RANLIB = ranlib +RM = rm -f +LIBS = -lm $(MYLIBS) MYCFLAGS= MYLDFLAGS= diff --git a/crawl-ref/source/util/sqlite/Makefile b/crawl-ref/source/util/sqlite/Makefile index 6f9686fbd8..ab7b00d8e0 100644 --- a/crawl-ref/source/util/sqlite/Makefile +++ b/crawl-ref/source/util/sqlite/Makefile @@ -10,7 +10,7 @@ endif LIBSQL = libsqlite3.a AR = ar rcu -CC = gcc +CC ?= gcc RANLIB = ranlib RM_F = rm -f |