From d9d9fa6125d95af9947478f14f70b20a4c50719e Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Mon, 12 Oct 2015 20:44:36 +0200 Subject: Revert "Get rid of VAR += `pkg-config ...` idiom" This reverts commit 3e4957cbf3342fc90fb5578125cb492a12e84cd4. --- modules/directfb/module.mk | 4 ++-- modules/gst/module.mk | 4 ++-- modules/gst1/module.mk | 4 ++-- modules/gst_video/module.mk | 4 ++-- modules/gst_video1/module.mk | 4 ++-- modules/rst/module.mk | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/directfb/module.mk b/modules/directfb/module.mk index 29e3348..bde6556 100644 --- a/modules/directfb/module.mk +++ b/modules/directfb/module.mk @@ -7,7 +7,7 @@ MOD := directfb $(MOD)_SRCS += directfb.c -$(MOD)_LFLAGS != pkg-config --libs directfb -$(MOD)_CFLAGS != pkg-config --cflags directfb +$(MOD)_LFLAGS += `pkg-config --libs directfb ` +CFLAGS += `pkg-config --cflags directfb ` include mk/mod.mk diff --git a/modules/gst/module.mk b/modules/gst/module.mk index 17dae68..64db1bd 100644 --- a/modules/gst/module.mk +++ b/modules/gst/module.mk @@ -6,7 +6,7 @@ MOD := gst $(MOD)_SRCS += gst.c dump.c -$(MOD)_LFLAGS != pkg-config --libs gstreamer-0.10 -$(MOD)_CFLAGS != pkg-config --cflags gstreamer-0.10 +$(MOD)_LFLAGS += `pkg-config --libs gstreamer-0.10` +$(MOD)_CFLAGS += `pkg-config --cflags gstreamer-0.10` include mk/mod.mk diff --git a/modules/gst1/module.mk b/modules/gst1/module.mk index e9fad39..e79a9b7 100644 --- a/modules/gst1/module.mk +++ b/modules/gst1/module.mk @@ -6,8 +6,8 @@ MOD := gst1 $(MOD)_SRCS += gst.c -$(MOD)_LFLAGS != pkg-config --libs gstreamer-1.0 -$(MOD)_CFLAGS != pkg-config --cflags gstreamer-1.0 +$(MOD)_LFLAGS += `pkg-config --libs gstreamer-1.0` +$(MOD)_CFLAGS += `pkg-config --cflags gstreamer-1.0` $(MOD)_CFLAGS += -Wno-cast-align include mk/mod.mk diff --git a/modules/gst_video/module.mk b/modules/gst_video/module.mk index fc76b61..8e88f3e 100644 --- a/modules/gst_video/module.mk +++ b/modules/gst_video/module.mk @@ -6,7 +6,7 @@ MOD := gst_video $(MOD)_SRCS += gst_video.c h264.c encode.c sdp.c -$(MOD)_LFLAGS != pkg-config --libs gstreamer-0.10 gstreamer-app-0.10 -$(MOD)_CFLAGS != pkg-config --cflags gstreamer-0.10 gstreamer-app-0.10 +$(MOD)_LFLAGS += `pkg-config --libs gstreamer-0.10 gstreamer-app-0.10` +$(MOD)_CFLAGS += `pkg-config --cflags gstreamer-0.10 gstreamer-app-0.10` include mk/mod.mk diff --git a/modules/gst_video1/module.mk b/modules/gst_video1/module.mk index a6545a4..006ce93 100644 --- a/modules/gst_video1/module.mk +++ b/modules/gst_video1/module.mk @@ -6,8 +6,8 @@ MOD := gst_video1 $(MOD)_SRCS += gst_video.c h264.c encode.c sdp.c -$(MOD)_LFLAGS != pkg-config --libs gstreamer-1.0 gstreamer-app-1.0 -$(MOD)_CFLAGS != pkg-config --cflags gstreamer-1.0 gstreamer-app-1.0 +$(MOD)_LFLAGS += `pkg-config --libs gstreamer-1.0 gstreamer-app-1.0` +$(MOD)_CFLAGS += `pkg-config --cflags gstreamer-1.0 gstreamer-app-1.0` $(MOD)_CFLAGS += -Wno-cast-align include mk/mod.mk diff --git a/modules/rst/module.mk b/modules/rst/module.mk index 5901aa2..e7a0012 100644 --- a/modules/rst/module.mk +++ b/modules/rst/module.mk @@ -8,7 +8,7 @@ MOD := rst $(MOD)_SRCS += audio.c $(MOD)_SRCS += rst.c $(MOD)_SRCS += video.c -$(MOD)_LFLAGS != pkg-config --libs cairo libmpg123 -$(MOD)_CFLAGS != pkg-config --cflags cairo libmpg123 +$(MOD)_LFLAGS += `pkg-config --libs cairo libmpg123` +$(MOD)_CFLAGS += `pkg-config --cflags cairo libmpg123` include mk/mod.mk -- cgit v1.2.3