Skip to content

Commit 23da373

Browse files
committed
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.
1 parent d6d9e91 commit 23da373

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

gst/audiomixer/Makefile.am

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ include $(top_srcdir)/common/orc.mak
66

77
libgstaudiomixer_la_SOURCES = gstaudiomixer.c
88
nodist_libgstaudiomixer_la_SOURCES = $(ORC_NODIST_SOURCES)
9-
libgstaudiomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
10-
$(GST_CFLAGS) $(ORC_CFLAGS) \
9+
libgstaudiomixer_la_CFLAGS = \
1110
-I$(top_srcdir)/gst-libs \
12-
-I$(top_builddir)/gst-libs
11+
-I$(top_builddir)/gst-libs \
12+
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
13+
$(GST_CFLAGS) $(ORC_CFLAGS)
1314
libgstaudiomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
1415
libgstaudiomixer_la_LIBADD = \
15-
$(GST_PLUGINS_BASE_LIBS) \
16-
-lgstaudio-@GST_API_VERSION@ \
1716
$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
17+
$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
1818
$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
1919
libgstaudiomixer_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
2020

0 commit comments

Comments
 (0)