summaryrefslogtreecommitdiff
path: root/gst-libs/gst/audio
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2017-12-02 16:01:25 +0000
committerTim-Philipp Müller <tim@centricular.com>2017-12-02 16:14:36 +0000
commitd01297e115e475760764d9caa4eb37b5f7f9f31a (patch)
treeac7a05eadf2f5acb747b6a7b052ec444bac59437 /gst-libs/gst/audio
parent737067e793ab0bda60b7ec28af9b6fa51ace4581 (diff)
downloadgstreamer-plugins-bad-d01297e115e475760764d9caa4eb37b5f7f9f31a.tar.gz
Remove GstAggregator from -bad, moved to core
https://bugzilla.gnome.org/show_bug.cgi?id=739010
Diffstat (limited to 'gst-libs/gst/audio')
-rw-r--r--gst-libs/gst/audio/Makefile.am1
-rw-r--r--gst-libs/gst/audio/meson.build4
2 files changed, 2 insertions, 3 deletions
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 02154fa1d..ca9e3f7e4 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -18,7 +18,6 @@ libgstbadaudio_@GST_API_VERSION@_la_CFLAGS = \
$(GST_BASE_CFLAGS)
libgstbadaudio_@GST_API_VERSION@_la_LIBADD = \
- $(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) $(LIBM)
diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
index 3154e3ca3..ac4871903 100644
--- a/gst-libs/gst/audio/meson.build
+++ b/gst-libs/gst/audio/meson.build
@@ -10,9 +10,9 @@ gstbadaudio = library('gstbadaudio-' + api_version,
version : libversion,
soversion : soversion,
install : true,
- dependencies : [gstbadbase_dep, gstaudio_dep],
+ dependencies : [gstaudio_dep, gstbase_dep],
)
gstbadaudio_dep = declare_dependency(link_with : gstbadaudio,
include_directories : [libsinc],
- dependencies : [gstbadbase_dep, gstaudio_dep])
+ dependencies : [gstaudio_dep, gstbase_dep])