josh/anaglym
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed Makefile: added SHELL, s/LUA_INCLUDE/LUAINCLUDE/, stripping spaces

Browse Source 
git-svn-id: svn://anubis/anaglym/trunk@13 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
Josh Holtrop 2009-09-16 02:40:22 +00:00
parent 7ad767dab0
commit 7424521468
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,4 +1,7 @@
# fix broken ubuntu
SHELL := bash
TARGET := anaglym TARGET := anaglym
COBJS := $(patsubst %.c,%.o,$(wildcard *.c)) COBJS := $(patsubst %.c,%.o,$(wildcard *.c))
CXXOBJS := $(patsubst %.cc,%.o,$(wildcard *.cc)) CXXOBJS := $(patsubst %.cc,%.o,$(wildcard *.cc))
@ -8,11 +11,11 @@ CXXDEPS := $(CXXOBJS:.o=.dep)
DEPS := $(CDEPS) $(CXXDEPS) DEPS := $(CDEPS) $(CXXDEPS)
LUAINCLUDE := $(shell which lua-config >/dev/null 2>&1; if [[ $$? == 0 ]]; then lua-config --include; fi) LUAINCLUDE := $(shell which lua-config >/dev/null 2>&1; if [[ $$? == 0 ]]; then lua-config --include; fi)
ifeq ($(LUA_INCLUDE),) ifeq ($(strip $(LUA_INCLUDE)),)
LUA_INCLUDE := -I/usr/include/lua5.1 LUAINCLUDE := -I/usr/include/lua5.1
endif endif
LUALIBS := $(shell which lua-config >/dev/null 2>&1; if [[ $$? == 0 ]]; then lua-config --libs; fi) LUALIBS := $(shell which lua-config >/dev/null 2>&1; if [[ $$? == 0 ]]; then lua-config --libs; fi)
ifeq ($(LUALIBS),) ifeq ($(strip $(LUALIBS)),)
LUALIBS := -llua5.1 LUALIBS := -llua5.1
endif endif