cpp/openttd-patchpack/source Changeset - r1254:dfaaa8616a9e

Changeset - r1254:dfaaa8616a9e

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

tron - 19 years ago 2005-02-01 05:28:18
tron@openttd.org

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

1 file changed with 8 insertions and 8 deletions:

Makefile

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -247,13 +247,13 @@ endif @@
 ifndef REV_NUMBER
 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)
 endwarnings:=endwarnings
 _bit_warnings:=64_bit_warnings
 BASECFLAGS += -m64
@@ @@ -370,17 +370,17 @@ LDFLAGS += -lnsl -lsocket @@
 endif
 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
 # zlib config
 ifdef WITH_ZLIB
@@ @@ -421,25 +421,25 @@ endif @@
 ifdef WITH_PNG
 CDEFS += -DWITH_PNG
 # FreeBSD doesn't use libpng-config
 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
 # enables/disables assert()
 ifdef DISABLE_ASSERTS

0 comments (0 inline, 0 general)