From 97d49406dc3875173d7da2ab66ff5370ad009d19 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Tue, 28 Sep 2010 09:30:57 -0300 Subject: [PATCH] More makefile Fixes Removing some not needed lines added in the last makefile fixes commit (previous commit). Also adds some more makefile files to check tests --- tests/check/Makefile.am | 7 +++++-- tools/Makefile.am | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index c605275..7ad48c4 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -219,7 +219,8 @@ libs_rtp_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(AM_CFLAGS) libs_rtp_LDADD = \ - $(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la $(LDADD) + $(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la \ + $(GST_BASE_LIBS) $(LDADD) libs_tag_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ @@ -233,7 +234,9 @@ libs_pbutils_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(AM_CFLAGS) libs_pbutils_LDADD = \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la $(LDADD) + $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ + $(GST_BASE_LIBS) $(LDADD) elements_appsink_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 406d64e..48e50d5 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -16,8 +16,7 @@ EXTRA_DIST = \ LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la\ -lgstpbutils-@GST_MAJORMINOR@ \ $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la\ - -lgstvideo-@GST_MAJORMINOR@ \ - $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) + $(GST_BASE_LIBS) $(GST_LIBS) AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -- 2.7.4