From: Dan Dennedy <dan@dennedy.org>
Date: Mon, 30 Dec 2013 23:50:28 +0000 (-0800)
Subject: Convert backtick to $(shell) in Makefiles.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e847902313efa55aeb46ba102433ccddb046edeb;p=mlt

Convert backtick to $(shell) in Makefiles.
---

diff --git a/Makefile b/Makefile
index cf10b442..e5b17f24 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ dist:
 	git archive --format=tar --prefix=mlt-$(version)/ v$(version) | gzip >mlt-$(version).tar.gz
 
 validate-yml:
-	for file in `find src/modules -type f -name \*.yml`; do \
+	for file in $$(find src/modules -type f -name \*.yml); do \
 		echo "validate: $$file"; \
 		kwalify -f src/framework/metaschema.yaml $$file || exit 1; \
 	done
diff --git a/src/examples/Makefile b/src/examples/Makefile
index 08b27a13..0fabce85 100644
--- a/src/examples/Makefile
+++ b/src/examples/Makefile
@@ -1,5 +1,5 @@
-CXXFLAGS += -Wall -g `pkg-config mlt++ --cflags` 
-LDFLAGS += `pkg-config mlt++ --libs`
+CXXFLAGS += -Wall -g $(shell pkg-config mlt++ --cflags)
+LDFLAGS += $(shell pkg-config mlt++ --libs)
 CC=c++
 
 all:		play
diff --git a/src/melt/Makefile b/src/melt/Makefile
index acac736e..b2ea3ed9 100644
--- a/src/melt/Makefile
+++ b/src/melt/Makefile
@@ -11,8 +11,8 @@ SRCS := $(OBJS:.o=.c)
 
 ifeq ($(targetos), MinGW)
 ifeq (, $(findstring MELT_NOSDL, $(CFLAGS)))
-CFLAGS += `sdl-config --cflags`
-LDFLAGS += `sdl-config --libs`
+CFLAGS += $(shell sdl-config --cflags)
+LDFLAGS += $(shell sdl-config --libs)
 endif
 bindir = $(prefix)
 endif
diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 0d26b04b..b15fed75 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -27,8 +27,8 @@ CFLAGS += -DFILTERS
 endif
 
 ifdef VDPAU
-CFLAGS += -DVDPAU `pkg-config --cflags x11`
-LDFLAGS += $(LIBDL) `pkg-config --libs x11`
+CFLAGS += -DVDPAU $(shell pkg-config pkg-config --cflags x11)
+LDFLAGS += $(LIBDL) $(shell pkg-config pkg-config --libs x11)
 endif
 
 ifdef CODECS
diff --git a/src/modules/frei0r/Makefile b/src/modules/frei0r/Makefile
index f6a9bbaa..33804025 100644
--- a/src/modules/frei0r/Makefile
+++ b/src/modules/frei0r/Makefile
@@ -12,10 +12,10 @@ OBJS = factory.o \
 	   transition_frei0r.o \
 	   frei0r_helper.o
 
-CFLAGS += `pkg-config --cflags frei0r 2> /dev/null`
+CFLAGS += $(shell pkg-config --cflags frei0r 2> /dev/null)
 
 LDFLAGS += -lm $(LIBDL)
-LDFLAGS += `pkg-config --libs frei0r 2> /dev/null`
+LDFLAGS += $(shell pkg-config --libs frei0r 2> /dev/null)
 
 SRCS := $(OBJS:.o=.c)
 
diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 4a3f5cb4..fe700e7e 100644
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -11,14 +11,14 @@ OBJS = factory.o
 
 ifdef USE_GTK2
 OBJS += consumer_gtk2.o
-CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gtk+-2.0`
-LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gtk+-2.0`
+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags gtk+-2.0)
+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs gtk+-2.0)
 endif
 
 ifdef USE_PIXBUF
 OBJS += producer_pixbuf.o pixops.o filter_rescale.o
-CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0`
-LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0`
+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0)
+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0)
 endif
 
 ifdef USE_EXIF
@@ -34,9 +34,9 @@ endif
 
 ifdef USE_PANGO
 OBJS += producer_pango.o
-CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2`
-CFLAGS += `pkg-config --cflags-only-I freetype2 | sed 's/ *$$//g')`/freetype
-LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2`
+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2)
+CFLAGS += $(shell pkg-config --cflags-only-I freetype2 | sed 's/ *$$//g')/freetype
+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2)
 ifeq ($(targetos),Darwin)
 LDFLAGS += -liconv
 endif
diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index dba6b7b7..aa5a3a1c 100644
--- a/src/modules/jackrack/Makefile
+++ b/src/modules/jackrack/Makefile
@@ -21,18 +21,18 @@ GPL_OBJS = jack_rack.o \
 OBJS = factory.o \
 	   consumer_jack.o
 
-CFLAGS += `pkg-config --cflags jack`
-LDFLAGS += `pkg-config --libs jack`
+CFLAGS += $(shell pkg-config --cflags jack)
+LDFLAGS += $(shell pkg-config --libs jack)
 
 ifdef GPL
 OBJS += $(GPL_OBJS)
 CFLAGS += -DGPL
-CFLAGS += `pkg-config --cflags libxml-2.0`
-CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags glib-2.0`
+CFLAGS += $(shell pkg-config --cflags libxml-2.0)
+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags glib-2.0)
 
 LDFLAGS += $(LIBDL)
-LDFLAGS += `pkg-config --libs libxml-2.0`
-LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs glib-2.0`
+LDFLAGS += $(shell pkg-config --libs libxml-2.0)
+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs glib-2.0)
 LDFLAGS += -lm
 
 YML_FILES = *.yml
diff --git a/src/modules/opengl/Makefile b/src/modules/opengl/Makefile
index 10276a92..1e312ca1 100644
--- a/src/modules/opengl/Makefile
+++ b/src/modules/opengl/Makefile
@@ -30,18 +30,18 @@ CPPOBJS += transition_movit_mix.o
 CPPOBJS += transition_movit_overlay.o
 
 CXXFLAGS += -Wno-deprecated $(CFLAGS)
-CXXFLAGS += `pkg-config --cflags movit 2> /dev/null`
+CXXFLAGS += $(shell pkg-config --cflags movit 2> /dev/null)
 
-SHADERDIR = `pkg-config --variable=shaderdir movit`
+SHADERDIR = $(shell pkg-config --variable=shaderdir movit)
 CXXFLAGS += -DSHADERDIR=\"$(SHADERDIR)\"
 
 LDFLAGS += -L../../mlt++ -lmlt++
 
 ifeq ($(targetos), MinGW)
-	CXXFLAGS += `pkg-config --cflags glew`
-	LDFLAGS += -lmovit `pkg-config --libs-only-L glew` -lglew32 -lopengl32
+	CXXFLAGS += $(shell pkg-config --cflags glew)
+	LDFLAGS += -lmovit $(shell pkg-config --libs-only-L glew) -lglew32 -lopengl32
 else
-	LDFLAGS += `pkg-config --libs movit 2> /dev/null`
+	LDFLAGS += $(shell pkg-config --libs movit 2> /dev/null)
 ifeq ($(targetos), Darwin)
 	CXXFLAGS += -FOpenGL
 	LDFLAGS += -framework OpenGL
diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile
index 28545d51..0b9f2b98 100644
--- a/src/modules/resample/Makefile
+++ b/src/modules/resample/Makefile
@@ -9,9 +9,9 @@ TARGET = ../libmltresample$(LIBSUF)
 OBJS = factory.o \
 	   filter_resample.o 
 
-CFLAGS += `pkg-config --cflags samplerate`
+CFLAGS += $(shell pkg-config --cflags samplerate)
 
-LDFLAGS += `pkg-config --libs samplerate`
+LDFLAGS += $(shell pkg-config --libs samplerate)
 
 SRCS := $(OBJS:.o=.c)
 
diff --git a/src/modules/rtaudio/Makefile b/src/modules/rtaudio/Makefile
index acada51f..18749d75 100644
--- a/src/modules/rtaudio/Makefile
+++ b/src/modules/rtaudio/Makefile
@@ -24,8 +24,8 @@ LDFLAGS += -lole32 -ldsound -lwinmm
 #CXXFLAGS +=-D__WINDOWS_ASIO__
 else ifeq ($(targetos), Linux)
 CXXFLAGS += -D__LINUX_ALSA__
-CXXFLAGS += `pkg-config --cflags alsa`
-LDFLAGS += `pkg-config --libs alsa`
+CXXFLAGS += $(shell pkg-config --cflags alsa)
+LDFLAGS += $(shell pkg-config --libs alsa)
 else ifeq ($(targetos), NetBSD)
 CXXFLAGS += -D__LINUX_OSS__
 LDFLAGS += -lossaudio
diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index e368730c..6919264d 100644
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -21,9 +21,9 @@ else ifneq ($(targetos), MinGW)
 LDFLAGS += -lX11
 endif
 
-CFLAGS += `sdl-config --cflags`
+CFLAGS += $(shell sdl-config --cflags)
 
-LDFLAGS += `sdl-config --libs`
+LDFLAGS += $(shell sdl-config --libs)
 
 ifeq ($(WITH_SDL_IMAGE),1)
 OBJS += producer_sdl_image.o
diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile
index 399c3ae3..dbc9fcb1 100644
--- a/src/modules/vorbis/Makefile
+++ b/src/modules/vorbis/Makefile
@@ -9,11 +9,11 @@ TARGET = ../libmltvorbis$(LIBSUF)
 OBJS = factory.o \
 	   producer_vorbis.o
 
-CFLAGS += `pkg-config --cflags vorbis`
-CFLAGS += `pkg-config --cflags vorbisfile`
+CFLAGS += $(shell pkg-config --cflags vorbis)
+CFLAGS += $(shell pkg-config --cflags vorbisfile)
 
-LDFLAGS += `pkg-config --libs vorbis`
-LDFLAGS += `pkg-config --libs vorbisfile`
+LDFLAGS += $(shell pkg-config --libs vorbis)
+LDFLAGS += $(shell pkg-config --libs vorbisfile)
 
 SRCS := $(OBJS:.o=.c)
 
diff --git a/src/modules/xml/Makefile b/src/modules/xml/Makefile
index fafc540c..6bdf19ee 100644
--- a/src/modules/xml/Makefile
+++ b/src/modules/xml/Makefile
@@ -10,9 +10,9 @@ OBJS = factory.o \
 	   consumer_xml.o \
 	   producer_xml.o
 
-CFLAGS += `pkg-config libxml-2.0 --cflags`
+CFLAGS += $(shell pkg-config libxml-2.0 --cflags)
 
-LDFLAGS += `pkg-config libxml-2.0 --libs`
+LDFLAGS += $(shell pkg-config libxml-2.0 --libs)
 
 SRCS := $(OBJS:.o=.c)
 
diff --git a/src/swig/Makefile b/src/swig/Makefile
index b2636443..8ee7454d 100644
--- a/src/swig/Makefile
+++ b/src/swig/Makefile
@@ -6,7 +6,7 @@ all clean:
 	for subdir in $$list; do \
 		if [ -x $$subdir/build -a ! -f .$$subdir -o $@ = clean ] ; \
 		then echo -n Building $$subdir... ; \
-			cd $$subdir && output=`CXXFLAGS="$(CXXFLAGS)" ./build $@ 2>&1` ; \
+			cd $$subdir && output=$$(CXXFLAGS="$(CXXFLAGS)" ./build $@ 2>&1) ; \
 			if [ $$? -eq 0 ] ; \
 			then echo OK && touch ../.$$subdir ; \
 			else echo $$output && exit 1 ; \