From b2fef1f9d25ea2dfe93ed225446205195e31835d Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Sun, 21 Dec 2014 07:47:25 -0500 Subject: [PATCH] audiomixer: fix build flag order Have the libraries/inlcudes from plugins-bad first to avoid picking up the installed version. Fixes the build when the local api changed. --- gst/audiomixer/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gst/audiomixer/Makefile.am b/gst/audiomixer/Makefile.am index 372c006869..2a3051ddb1 100644 --- a/gst/audiomixer/Makefile.am +++ b/gst/audiomixer/Makefile.am @@ -6,15 +6,15 @@ include $(top_srcdir)/common/orc.mak libgstaudiomixer_la_SOURCES = gstaudiomixer.c nodist_libgstaudiomixer_la_SOURCES = $(ORC_NODIST_SOURCES) -libgstaudiomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) $(ORC_CFLAGS) \ +libgstaudiomixer_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ - -I$(top_builddir)/gst-libs + -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) $(ORC_CFLAGS) libgstaudiomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiomixer_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-@GST_API_VERSION@ \ $(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) libgstaudiomixer_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)