From: Jan Schmidt Date: Thu, 26 Jul 2007 15:35:43 +0000 (+0000) Subject: gst-libs/gst/riff/Makefile.am: Pull in our dependencies from -base before those from... X-Git-Tag: 1.19.3~511^2~11037 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50a3a239a0adff7560ade43721331abe334f8b33;p=platform%2Fupstream%2Fgstreamer.git gst-libs/gst/riff/Makefile.am: Pull in our dependencies from -base before those from outside. Original commit message from CVS: * gst-libs/gst/riff/Makefile.am: Pull in our dependencies from -base before those from outside. --- diff --git a/ChangeLog b/ChangeLog index c969c80..904c671 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-26 Jan Schmidt + + * gst-libs/gst/riff/Makefile.am: + Pull in our dependencies from -base before those from outside. + 2007-07-26 Wim Taymans * docs/libs/gst-plugins-base-libs-sections.txt: diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index fd230da..f171253 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -11,8 +11,10 @@ libgstriff_@GST_MAJORMINOR@include_HEADERS = \ riff-media.h \ riff-read.h -libgstriff_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \ +libgstriff_@GST_MAJORMINOR@_la_LIBADD = \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ + $(GST_BASE_LIBS) $(GST_LIBS) + libgstriff_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstriff_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)