summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-02-01 05:28:18 +0000
committertron <tron@openttd.org>2005-02-01 05:28:18 +0000
commit909522045092753c1da9cc6f0b1438d65a55ea15 (patch)
tree9300dba31261ed546cf9da03c6356b39a69bb461
parent2357280ca017304026d2ab75323bbafc4360ec74 (diff)
downloadopenttd-909522045092753c1da9cc6f0b1438d65a55ea15.tar.xz
(svn r1758) Replace `` with $(shell), because the latter is only evaluated once instead of over and over again
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index afed8fbe1..cafffdcdc 100644
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,7 @@ REV_NUMBER:=0
endif
# MorphOS needs builddate
-BUILDDATE=`date +%d.%m.%y`
+BUILDDATE=$(shell date +%d.%m.%y)
# AMD64 needs a little more settings to work
ifeq ($(shell uname -m), x86_64)
@@ -373,11 +373,11 @@ endif
# SDL config
ifdef WITH_SDL
CDEFS += -DWITH_SDL
-CFLAGS += `$(SDL-CONFIG) --cflags`
+CFLAGS += $(shell $(SDL-CONFIG) --cflags)
ifdef STATIC
-LIBS += `$(SDL-CONFIG) --static-libs`
+LIBS += $(shell $(SDL-CONFIG) --static-libs)
else
-LIBS += `$(SDL-CONFIG) --libs`
+LIBS += $(shell $(SDL-CONFIG) --libs)
endif
endif
@@ -424,19 +424,19 @@ CDEFS += -DWITH_PNG
ifdef FREEBSD
LIBS += -lpng
else
-CFLAGS += `libpng-config --cflags`
+CFLAGS += $(shell libpng-config --cflags)
# seems like older libpng versions are broken and need this
PNGCONFIG_FLAGS = --ldflags --libs
ifdef STATIC
ifdef OSX
# 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
-LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)`
+LIBS += $(shell libpng-config --static $(PNGCONFIG_FLAGS))
endif
else
-LIBS += `libpng-config --L_opts $(PNGCONFIG_FLAGS)`
+LIBS += $(shell libpng-config --L_opts $(PNGCONFIG_FLAGS))
endif
endif
endif