diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2008-05-16 19:56:30 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-05-16 19:56:30 +0000 |
| commit | d5641e3e6b8d4a665431f20e077873b8016bbb1d (patch) | |
| tree | 12fec2047a36c1d384678c618832b118d2e99513 | |
| parent | 363d6a265272e906892f78b86a2d76f10b0528d6 (diff) | |
| download | gst-plugins-bad-d5641e3e6b8d4a665431f20e077873b8016bbb1d.tar.gz gst-plugins-bad-d5641e3e6b8d4a665431f20e077873b8016bbb1d.tar.bz2 gst-plugins-bad-d5641e3e6b8d4a665431f20e077873b8016bbb1d.zip | |
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
| -rw-r--r-- | ChangeLog | 11 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | docs/Makefile.am | 8 | ||||
| -rw-r--r-- | gst/bayer/Makefile.am | 6 | ||||
| -rw-r--r-- | gst/rtpmanager/Makefile.am | 10 |
5 files changed, 28 insertions, 7 deletions
@@ -1,5 +1,16 @@ 2008-05-16 Jan Schmidt <jan.schmidt@sun.com> + * 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 + +2008-05-16 Jan Schmidt <jan.schmidt@sun.com> + * docs/plugins/gst-plugins-bad-plugins.types: Remove bogus attempt to pull 'metadata' plugin's base class into the docs. diff --git a/common b/common -Subproject 0823ac6b46b7332109bbc5f1ef40e24e648fae5 +Subproject 3b3631082d04b426f450810e8836de94e9c5d60 diff --git a/docs/Makefile.am b/docs/Makefile.am index 2b9075b7..762d93b2 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,5 +1,11 @@ +if ENABLE_PLUGIN_DOCS +PLUGIN_DOCS_DIRS = plugins +else +PLUGIN_DOCS_DIRS = +endif + if ENABLE_GTK_DOC -GTK_DOC_DIRS = plugins +GTK_DOC_DIRS = $(PLUGINS_DOCS_DIRS) else GTK_DOC_DIRS = endif 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) |