diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-09-10 07:56:25 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-09-10 07:56:25 +0200 |
| commit | 5a8e9cd080c04fccd782875192f8c37b9b416a4e (patch) | |
| tree | f7ce57d27d78779b3f8ea8138ceed1c1997a8aaa | |
| parent | 76e96c70bd8f0a5dd96bd8824210951547ff2228 (diff) | |
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.
| -rw-r--r-- | ext/ladspa/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/lv2/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 23c84f57b..3eefa5bff 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-@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 28a8f1fe7..0dbd92f17 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-@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 a84553903..5ec73f113 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-@GST_MAJORMINOR@.la -noinst_HEADERS = gstsignalprocessor.h +libgstsignalprocessor_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/signalprocessor +libgstsignalprocessor_@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_@GST_MAJORMINOR@_la_SOURCES = gstsignalprocessor.c +libgstsignalprocessor_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstsignalprocessor_@GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-@GST_MAJORMINOR@ +libgstsignalprocessor_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) |