From 4e5347c8feb5583ed3d806a7d51a20ab2b1da05a Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 16 May 2008 19:56:30 +0000 Subject: [PATCH] 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/rtpmanager/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gst/rtpmanager/Makefile.am b/gst/rtpmanager/Makefile.am index cad27a366f..8f214de734 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)