diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-06-22 17:04:00 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-06-22 17:04:00 -0400 |
| commit | 218878de5ea48b5acdf36070a73a50fd71f41741 (patch) | |
| tree | 12384ce50f1af7eb61c2c18a0d6141595797bc53 /ext/ladspa | |
| parent | 925e83ee60c5406b2e5f0f39b0da0f90370efc27 (diff) | |
| parent | a2a0322df9a7005a01aafb5efc32fcc1179d205c (diff) | |
| download | gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.tar.gz gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.tar.bz2 gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Conflicts:
ext/ladspa/Makefile.am
ext/ladspa/gstladspa.h
ext/lv2/Makefile.am
ext/lv2/gstlv2.h
Diffstat (limited to 'ext/ladspa')
| -rw-r--r-- | ext/ladspa/Makefile.am | 10 | ||||
| -rw-r--r-- | ext/ladspa/gstladspa.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am index 00582ed7..23c84f57 100644 --- a/ext/ladspa/Makefile.am +++ b/ext/ladspa/Makefile.am @@ -1,8 +1,14 @@ plugin_LTLIBRARIES = libgstladspa.la libgstladspa_la_SOURCES = gstladspa.c -libgstladspa_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(LRDF_CFLAGS) -libgstladspa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LIBM) $(LRDF_LIBS) ../../gst-libs/gst/signalprocessor/libgstsignalprocessor.la +libgstladspa_la_CFLAGS = \ + -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(LRDF_CFLAGS) +libgstladspa_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor.la \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(LIBM) $(LRDF_LIBS) libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstladspa_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/ladspa/gstladspa.h b/ext/ladspa/gstladspa.h index f51d6233..14532318 100644 --- a/ext/ladspa/gstladspa.h +++ b/ext/ladspa/gstladspa.h @@ -28,7 +28,7 @@ #include <gst/gst.h> -#include "../../gst-libs/gst/signalprocessor/gstsignalprocessor.h" +#include <gst/signalprocessor/gstsignalprocessor.h> G_BEGIN_DECLS |