Revert "* Don't override environment variables in Makefile"
This reverts commit e60afb9e0d2b1f791399f91c5de626fe215d1d88.
This commit is contained in:
parent
11a4ce396c
commit
a042407e94
1 changed files with 15 additions and 15 deletions
|
@ -1,22 +1,22 @@
|
|||
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)
|
||||
SHLIB_FLAGS ?= -bundle -undefined dynamic_lookup
|
||||
SHLIB_FLAGS = -bundle -undefined dynamic_lookup
|
||||
else
|
||||
SHLIB_FLAGS ?= -shared
|
||||
SHLIB_FLAGS = -shared
|
||||
endif
|
||||
LINK ?= $(CC)
|
||||
LINK = $(CC)
|
||||
|
||||
|
|
Loading…
Reference in a new issue