gst-libs: Fix dependency build

adaptivedemux depends on uridownloader and video depends on base

diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index acde33f..edd24b1 100644 (file)
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -16,3 +16,21 @@ SUBDIRS = adaptivedemux interfaces basecamerabinsrc codecparsers \
 noinst_HEADERS = gst-i18n-plugin.h gettext.h glib-compat-private.h
 DIST_SUBDIRS = adaptivedemux interfaces gl basecamerabinsrc codecparsers \
        insertbin uridownloader mpegts wayland base video
+
+#dependencies
+video: base
+
+adaptivedemux: uridownloader
+
+INDEPENDENT_SUBDIRS = \
+       interfaces basecamerabinsrc codecparsers insertbin uridownloader \
+       mpegts base $(GL_DIR) $(WAYLAND_DIR)
+
+.PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS)
+
+independent-subdirs: $(INDEPENDENT_SUBDIRS)
+
+$(INDEPENDENT_SUBDIRS):
+       $(MAKE) -C $@
+
+all-recursive: independent-subdirs

diff --git a/gst-libs/gst/adaptivedemux/Makefile.am b/gst-libs/gst/adaptivedemux/Makefile.am
index 4d89a62..7ef8990 100644 (file)
--- a/gst-libs/gst/adaptivedemux/Makefile.am
+++ b/gst-libs/gst/adaptivedemux/Makefile.am
@@ -16,6 +16,7 @@ libgstadaptivedemux_@GST_API_VERSION@_la_CFLAGS = \
        -DGST_USE_UNSTABLE_API \
        $(GST_CFLAGS)
 libgstadaptivedemux_@GST_API_VERSION@_la_LIBADD = \
+       $(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-$(GST_API_VERSION).la \
        -lgstapp-$(GST_API_VERSION) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
 
 libgstadaptivedemux_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)