Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-19 15:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r1758) Replace `` with $(shell), because the latter is only evaluated once instead of over and over again

Browse Source
This commit is contained in:
tron 2005-02-01 05:28:18 +00:00
parent ff973f7992
commit 8dc84b3deb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -250,7 +250,7 @@ REV_NUMBER:=0
endif endif
# MorphOS needs builddate # MorphOS needs builddate
BUILDDATE=`date +%d.%m.%y` BUILDDATE=$(shell date +%d.%m.%y)
# AMD64 needs a little more settings to work # AMD64 needs a little more settings to work
ifeq ($(shell uname -m), x86_64) ifeq ($(shell uname -m), x86_64)
@ -373,11 +373,11 @@ endif
# SDL config # SDL config
ifdef WITH_SDL ifdef WITH_SDL
CDEFS += -DWITH_SDL CDEFS += -DWITH_SDL
CFLAGS += `$(SDL-CONFIG) --cflags` CFLAGS += $(shell $(SDL-CONFIG) --cflags)
ifdef STATIC ifdef STATIC
LIBS += `$(SDL-CONFIG) --static-libs` LIBS += $(shell $(SDL-CONFIG) --static-libs)
else else
LIBS += `$(SDL-CONFIG) --libs` LIBS += $(shell $(SDL-CONFIG) --libs)
endif endif
endif endif
@ -424,19 +424,19 @@ CDEFS += -DWITH_PNG
ifdef FREEBSD ifdef FREEBSD
LIBS += -lpng LIBS += -lpng
else else
CFLAGS += `libpng-config --cflags` CFLAGS += $(shell libpng-config --cflags)
# seems like older libpng versions are broken and need this # seems like older libpng versions are broken and need this
PNGCONFIG_FLAGS = --ldflags --libs PNGCONFIG_FLAGS = --ldflags --libs
ifdef STATIC ifdef STATIC
ifdef OSX ifdef OSX
# Seems like we need a tiny hack for OSX static to work # Seems like we need a tiny hack for OSX static to work
LIBS += `libpng-config --prefix`/lib/libpng.a LIBS += $(shell libpng-config --prefix)/lib/libpng.a
else else
LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)` LIBS += $(shell libpng-config --static $(PNGCONFIG_FLAGS))
endif endif
else else
LIBS += `libpng-config --L_opts $(PNGCONFIG_FLAGS)` LIBS += $(shell libpng-config --L_opts $(PNGCONFIG_FLAGS))
endif endif
endif endif
endif endif