Mercurial > hg > dmlib

changeset 1398:2791f790497d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use $(shell ..) instead of backtics.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 28 Oct 2017 17:45:39 +0300
parents 01d9bd6e88a8
children 30c888dfec9f
files Makefile Makefile.cross-mingw
diffstat 2 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Oct 28 04:25:42 2017 +0300
+++ b/Makefile	Sat Oct 28 17:45:39 2017 +0300
@@ -10,20 +10,20 @@
 INSTALL ?= install
 RANLIB ?= ranlib
 
-SDL_CFLAGS ?= `pkg-config --cflags sdl`
-SDL_LDFLAGS ?= `pkg-config --libs sdl`
+SDL_CFLAGS ?= $(shell pkg-config --cflags sdl)
+SDL_LDFLAGS ?= $(shell pkg-config --libs sdl)
 
-SDL_TTF_CFLAGS ?= `pkg-config --cflags SDL_ttf`
-SDL_TTF_LDFLAGS ?= `pkg-config --libs SDL_ttf`
+SDL_TTF_CFLAGS ?= $(shell pkg-config --cflags SDL_ttf)
+SDL_TTF_LDFLAGS ?= $(shell pkg-config --libs SDL_ttf)
 
-TREMOR_CFLAGS ?= `pkg-config --cflags ogg`
-TREMOR_LDFLAGS ?= /usr/lib/libvorbisidec.a `pkg-config --variable=libdir ogg`/libogg.a
+TREMOR_CFLAGS ?= $(shell pkg-config --cflags ogg)
+TREMOR_LDFLAGS ?= /usr/lib/libvorbisidec.a $(shell pkg-config --variable=libdir ogg)/libogg.a
 
-LIBPNG_CFLAGS ?= `pkg-config --cflags libpng`
-LIBPNG_LDFLAGS ?= `pkg-config --libs libpng`
+LIBPNG_CFLAGS ?= $(shell pkg-config --cflags libpng)
+LIBPNG_LDFLAGS ?= $(shell pkg-config --libs libpng) 
 
-ZLIB_CFLAGS ?= `pkg-config --cflags zlib`
-ZLIB_LDFLAGS ?= `pkg-config --libs zlib`
+ZLIB_CFLAGS ?= $(shell pkg-config --cflags zlib)
+ZLIB_LDFLAGS ?= $(shell pkg-config --libs zlib)
 
 
 TOOL_LDFLAGS ?= $(SDL_LDFLAGS)
--- a/Makefile.cross-mingw	Sat Oct 28 04:25:42 2017 +0300
+++ b/Makefile.cross-mingw	Sat Oct 28 17:45:39 2017 +0300
@@ -16,14 +16,14 @@
 RANLIB = $(MINGW_PREFIX)ranlib
 RM ?= rm
 
-SDL_CFLAGS ?= `$(MINGW_PATH)/bin/sdl-config --cflags`
-SDL_LDFLAGS ?= `$(MINGW_PATH)/bin/sdl-config --libs`
+SDL_CFLAGS ?= $(shell $(MINGW_PATH)/bin/sdl-config --cflags)
+SDL_LDFLAGS ?= $(shell $(MINGW_PATH)/bin/sdl-config --libs)
 
 SDL_TTF_CFLAGS ?=
 SDL_TTF_LDFLAGS ?= -lSDL_ttf
 
 TREMOR_CFLAGS ?= -I$(MINGW_PATH)/include/tremor
-TREMOR_LDFLAGS ?= $(MINGW_PATH)/lib/libvorbisidec.a  $(MINGW_PATH)/lib/libogg.a
+TREMOR_LDFLAGS ?= $(MINGW_PATH)/lib/libvorbisidec.a $(MINGW_PATH)/lib/libogg.a
 
 LIBPNG_CFLAGS ?= -I$(MINGW_PATH)/include
 LIBPNG_LDFLAGS ?= $(MINGW_PATH)/lib/libpng.a