From d5641e3e6b8d4a665431f20e077873b8016bbb1d Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 16 May 2008 19:56:30 +0000 Subject: docs/Makefile.am: Don't attempt to build plugin docs when they're disabled. Original commit message from CVS: * docs/Makefile.am: Don't attempt to build plugin docs when they're disabled. * gst/bayer/Makefile.am: Add libgstvideo to the link. * gst/rtpmanager/Makefile.am: Fix link order, and move LIBS things to _LIBS --- gst/bayer/Makefile.am | 6 ++++-- gst/rtpmanager/Makefile.am | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'gst') diff --git a/gst/bayer/Makefile.am b/gst/bayer/Makefile.am index b4001502..4f178406 100644 --- a/gst/bayer/Makefile.am +++ b/gst/bayer/Makefile.am @@ -1,7 +1,9 @@ plugin_LTLIBRARIES = libgstbayer.la libgstbayer_la_SOURCES = gstbayer.c gstbayer2rgb.c -libgstbayer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstbayer_la_LIBADD = $(GST_BASE_LIBS) +libgstbayer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) +libgstbayer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) libgstbayer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/rtpmanager/Makefile.am b/gst/rtpmanager/Makefile.am index cad27a36..8f214de7 100644 --- a/gst/rtpmanager/Makefile.am +++ b/gst/rtpmanager/Makefile.am @@ -36,10 +36,12 @@ noinst_HEADERS = gstrtpbin.h \ rtpstats.h \ gstrtpsession.h -libgstrtpmanager_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -libgstrtpmanager_la_LIBADD = $(GST_LIBS_LIBS) -libgstrtpmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \ - -lgstnetbuffer-@GST_MAJORMINOR@ +libgstrtpmanager_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ + $(ERROR_CFLAGS) +libgstrtpmanager_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ + -lgstnetbuffer-@GST_MAJORMINOR@ -lgstrtp-@GST_MAJORMINOR@ \ + $(GST_BASE_LIBS) $(GST_LIBS_LIBS) +libgstrtpmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) CLEANFILES = $(BUILT_SOURCES) -- cgit v1.2.1