summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-12-08 14:50:09 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-12-08 14:50:09 +0000
commit3b540378fb99bd69266bda7da3b64458ec87051c (patch)
treeecff307fb2024571fff9037aae5fb91e9e40e64f /gst
parent3bc7e8a9c18789e2df3f3056ed7200342cefb344 (diff)
parallel install fixes
Original commit message from CVS: parallel install fixes
Diffstat (limited to 'gst')
-rw-r--r--gst/adder/Makefile.am2
-rw-r--r--gst/audioscale/Makefile.am2
-rw-r--r--gst/sine/Makefile.am6
-rw-r--r--gst/videoscale/Makefile.am2
-rw-r--r--gst/videotestsrc/Makefile.am2
-rw-r--r--gst/volume/Makefile.am4
6 files changed, 9 insertions, 9 deletions
diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am
index 95d792f12..52101182d 100644
--- a/gst/adder/Makefile.am
+++ b/gst/adder/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstadder.la
diff --git a/gst/audioscale/Makefile.am b/gst/audioscale/Makefile.am
index aef3692f2..daf24fdc1 100644
--- a/gst/audioscale/Makefile.am
+++ b/gst/audioscale/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstaudioscale.la
diff --git a/gst/sine/Makefile.am b/gst/sine/Makefile.am
index 09da037e5..0c9fbbd70 100644
--- a/gst/sine/Makefile.am
+++ b/gst/sine/Makefile.am
@@ -1,10 +1,10 @@
-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstsinesrc.la
libgstsinesrc_la_SOURCES = gstsinesrc.c
libgstsinesrc_la_CFLAGS = $(GST_CFLAGS)
-libgstsinesrc_la_LIBADD = $(GST_LIBS) -lgstcontrol
+libgstsinesrc_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS)
libgstsinesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstsinesrc.h
@@ -16,4 +16,4 @@ endif
demo_dparams_SOURCES = demo-dparams.c
## putting GTK in front solves a bad compilation problem
demo_dparams_CFLAGS = $(GTK_CFLAGS) $(GST_CFLAGS)
-demo_dparams_LDFLAGS = $(GST_LIBS) $(GTK_LIBS) -lgstcontrol
+demo_dparams_LDFLAGS = $(GST_LIBS) $(GTK_LIBS) $(GST_CONTROL_LIBS)
diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am
index 1615d1d40..43efdef67 100644
--- a/gst/videoscale/Makefile.am
+++ b/gst/videoscale/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstvideoscale.la
diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am
index 69411bd0d..f9567dabb 100644
--- a/gst/videotestsrc/Makefile.am
+++ b/gst/videotestsrc/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstvideotestsrc.la
diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am
index 57a55a0b1..56ab272cc 100644
--- a/gst/volume/Makefile.am
+++ b/gst/volume/Makefile.am
@@ -1,10 +1,10 @@
-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstvolume.la
libgstvolume_la_SOURCES = gstvolume.c
libgstvolume_la_CFLAGS = $(GST_CFLAGS)
-libgstvolume_la_LIBADD = $(GST_LIBS) -lgstcontrol
+libgstvolume_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS)
libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstvolume.h filter.func