[gst-cvs] gst-plugins-bad: signalprocessor: Fix various build/dist issues

[Sebastian Dröge]

Module: gst-plugins-bad
Branch: master
Commit: 5a8e9cd080c04fccd782875192f8c37b9b416a4e
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=5a8e9cd080c04fccd782875192f8c37b9b416a4e

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu Sep 10 07:56:25 2009 +0200

signalprocessor: Fix various build/dist issues

Install the headers, version the library with @GST_MAJORMINOR@,
add all required libraries to _LIBADD instead of _LDFLAGS,
and add GST_*_LDFLAGS to _LDFLAGS.

Fixes bug #594715.

---

 ext/ladspa/Makefile.am                   |    2 +-
 ext/lv2/Makefile.am                      |    2 +-
 gst-libs/gst/signalprocessor/Makefile.am |   12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am
index 23c84f5..3eefa5b 100644
--- a/ext/ladspa/Makefile.am
+++ b/ext/ladspa/Makefile.am
@@ -6,7 +6,7 @@ libgstladspa_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(LRDF_CFLAGS)
 libgstladspa_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor.la \
+	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor- at GST_MAJORMINOR@.la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
 	$(LIBM) $(LRDF_LIBS)
 libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/ext/lv2/Makefile.am b/ext/lv2/Makefile.am
index 28a8f1f..0dbd92f 100644
--- a/ext/lv2/Makefile.am
+++ b/ext/lv2/Makefile.am
@@ -6,7 +6,7 @@ libgstlv2_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(SLV2_CFLAGS)
 libgstlv2_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor.la \
+	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor- at GST_MAJORMINOR@.la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
 	$(LIBM) $(SLV2_LIBS)
 libgstlv2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst-libs/gst/signalprocessor/Makefile.am b/gst-libs/gst/signalprocessor/Makefile.am
index a845539..5ec73f1 100644
--- a/gst-libs/gst/signalprocessor/Makefile.am
+++ b/gst-libs/gst/signalprocessor/Makefile.am
@@ -1,8 +1,10 @@
-lib_LTLIBRARIES = libgstsignalprocessor.la
+lib_LTLIBRARIES = libgstsignalprocessor- at GST_MAJORMINOR@.la
 
-noinst_HEADERS = gstsignalprocessor.h
+libgstsignalprocessor_ at GST_MAJORMINOR@includedir = $(includedir)/gstreamer- at GST_MAJORMINOR@/gst/signalprocessor
+libgstsignalprocessor_ at GST_MAJORMINOR@include_HEADERS = gstsignalprocessor.h
 
-libgstsignalprocessor_la_SOURCES = gstsignalprocessor.c
-libgstsignalprocessor_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstsignalprocessor_la_LDFLAGS = $(GST_PLUGINS_BASE_LIBS)
+libgstsignalprocessor_ at GST_MAJORMINOR@_la_SOURCES = gstsignalprocessor.c
+libgstsignalprocessor_ at GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstsignalprocessor_ at GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio- at GST_MAJORMINOR@
+libgstsignalprocessor_ at GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)