projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
11a4ce3
)
Revert "* Don't override environment variables in Makefile"
author
Steven Barth
<steven@midlink.org>
Tue, 3 Jun 2008 16:33:34 +0000
(16:33 +0000)
committer
Steven Barth
<steven@midlink.org>
Tue, 3 Jun 2008 16:33:34 +0000
(16:33 +0000)
This reverts commit
e60afb9e0d2b1f791399f91c5de626fe215d1d88
.
build/gccconfig.mk
patch
|
blob
|
history
diff --git
a/build/gccconfig.mk
b/build/gccconfig.mk
index
77bcf36
..
0e4de27
100644
(file)
--- a/
build/gccconfig.mk
+++ b/
build/gccconfig.mk
@@
-1,22
+1,22
@@
OS ?= $(shell uname)
OS ?= $(shell uname)
-LUA_SHLIBS
?
= $(shell pkg-config --silence-errors --libs lua5.1)
-LUA_LIBS
?
= $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a)))
-LUA_CFLAGS
?
= $(shell pkg-config --silence-errors --cflags lua5.1)
+LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1)
+LUA_LIBS = $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a)))
+LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1)
-CC
?
= gcc
-AR
?
= ar
-RANLIB
?
= ranlib
-CFLAGS
?
= -O2
-FPIC
?
= -fPIC
-EXTRA_CFLAGS
?
= --std=gnu99
-WFLAGS
?
= -Wall -Werror -pedantic
-CPPFLAGS
?
=
-COMPILE
?
= $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
+CC = gcc
+AR = ar
+RANLIB = ranlib
+CFLAGS = -O2
+FPIC = -fPIC
+EXTRA_CFLAGS = --std=gnu99
+WFLAGS = -Wall -Werror -pedantic
+CPPFLAGS =
+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
ifeq ($(OS),Darwin)
ifeq ($(OS),Darwin)
- SHLIB_FLAGS
?
= -bundle -undefined dynamic_lookup
+ SHLIB_FLAGS = -bundle -undefined dynamic_lookup
else
else
- SHLIB_FLAGS
?
= -shared
+ SHLIB_FLAGS = -shared
endif
endif
-LINK
?
= $(CC)
+LINK = $(CC)