summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2005-09-23 04:23:00 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2005-09-23 04:23:00 +0000
commit7593b38a57f55c28cdb4b8c3df27a13c6ce55d99 (patch)
tree13d564ed48fa161cc87f9dffaf6efa4152aa3dab /gst
parent50bdf8c4623926eadd834e463357077bba0eec90 (diff)
fix build and use of GST_LIBS
Original commit message from CVS: fix build and use of GST_LIBS
Diffstat (limited to 'gst')
-rw-r--r--gst/alpha/Makefile.am2
-rw-r--r--gst/auparse/Makefile.am5
-rw-r--r--gst/auparse/gstauparse.c2
-rw-r--r--gst/autodetect/Makefile.am2
-rw-r--r--gst/avi/Makefile.am11
-rw-r--r--gst/cutter/Makefile.am2
-rw-r--r--gst/debug/Makefile.am1
-rw-r--r--gst/effectv/Makefile.am17
-rw-r--r--gst/flx/Makefile.am3
-rw-r--r--gst/goom/Makefile.am8
-rw-r--r--gst/law/Makefile.am5
-rw-r--r--gst/matroska/Makefile.am2
-rw-r--r--gst/median/Makefile.am3
-rw-r--r--gst/monoscope/Makefile.am4
-rw-r--r--gst/multipart/Makefile.am2
-rw-r--r--gst/oldcore/Makefile.am2
-rw-r--r--gst/rtp/Makefile.am6
-rw-r--r--gst/rtsp/Makefile.am3
-rw-r--r--gst/smoothwave/Makefile.am3
-rw-r--r--gst/smpte/Makefile.am2
-rw-r--r--gst/videobox/Makefile.am3
-rw-r--r--gst/videofilter/Makefile.am4
-rw-r--r--gst/videomixer/Makefile.am2
-rw-r--r--gst/wavenc/Makefile.am3
-rw-r--r--gst/wavparse/Makefile.am9
25 files changed, 50 insertions, 56 deletions
diff --git a/gst/alpha/Makefile.am b/gst/alpha/Makefile.am
index 61f56e71..e96cfd56 100644
--- a/gst/alpha/Makefile.am
+++ b/gst/alpha/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstalpha.la
libgstalpha_la_SOURCES = gstalpha.c
libgstalpha_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstalpha_la_LIBADD =
+libgstalpha_la_LIBADD = $(GST_LIBS)
libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS =
diff --git a/gst/auparse/Makefile.am b/gst/auparse/Makefile.am
index 1a5ced96..e87e6f92 100644
--- a/gst/auparse/Makefile.am
+++ b/gst/auparse/Makefile.am
@@ -1,9 +1,8 @@
-
plugin_LTLIBRARIES = libgstauparse.la
libgstauparse_la_SOURCES = gstauparse.c
-libgstauparse_la_CFLAGS = $(GST_CFLAGS)
-libgstauparse_la_LIBADD =
+libgstauparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstauparse_la_LIBADD = $(GST_LIBS)
libgstauparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstauparse.h
diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c
index 5147a944..da284d38 100644
--- a/gst/auparse/gstauparse.c
+++ b/gst/auparse/gstauparse.c
@@ -166,7 +166,7 @@ gst_auparse_chain (GstPad * pad, GstBuffer * buf)
{
GstFlowReturn ret;
GstAuParse *auparse;
- gchar *data;
+ guchar *data;
glong size;
GstCaps *tempcaps;
gint law = 0, depth = 0, ieee = 0;
diff --git a/gst/autodetect/Makefile.am b/gst/autodetect/Makefile.am
index da9a1d9b..7c73402f 100644
--- a/gst/autodetect/Makefile.am
+++ b/gst/autodetect/Makefile.am
@@ -5,7 +5,7 @@ libgstautodetect_la_SOURCES = \
gstautodetect.c \
gstautovideosink.c
libgstautodetect_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
-libgstautodetect_la_LIBADD = $(GCONF_LIBS)
+libgstautodetect_la_LIBADD = $(GST_LIBS) $(GCONF_LIBS)
libgstautodetect_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am
index 83f1a9f0..c2755e19 100644
--- a/gst/avi/Makefile.am
+++ b/gst/avi/Makefile.am
@@ -9,11 +9,12 @@ noinst_HEADERS = \
gstavimux.h \
gstavidemux.h
-libgstavi_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
+libgstavi_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
-I$(top_srcdir)/gst-libs
-libgstavi_la_LIBADD = -lgstriff-@GST_MAJORMINOR@
-libgstavi_la_LDFLAGS = \
- $(GST_PLUGIN_LDFLAGS) \
- $(GST_PLUGINS_BASE_LIBS)
+libgstavi_la_LIBADD = \
+ $(GST_PLUGINS_BASE_LIBS) \
+ $(GST_LIBS) \
+ -lgstriff-@GST_MAJORMINOR@
+libgstavi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
EXTRA_DIST = README gstavimux.c
diff --git a/gst/cutter/Makefile.am b/gst/cutter/Makefile.am
index ec1a0ac4..e88ef155 100644
--- a/gst/cutter/Makefile.am
+++ b/gst/cutter/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstcutter.la
libgstcutter_la_SOURCES = gstcutter.c
libgstcutter_la_CFLAGS = $(GST_CFLAGS)
-libgstcutter_la_LIBADD =
+libgstcutter_la_LIBADD = $(GST_LIBS)
libgstcutter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstcutter.h filter.func
diff --git a/gst/debug/Makefile.am b/gst/debug/Makefile.am
index c531f1f0..f9013530 100644
--- a/gst/debug/Makefile.am
+++ b/gst/debug/Makefile.am
@@ -4,6 +4,7 @@ noinst_HEADERS = efence.h gstnavigationtest.h gstnavseek.h tests.h
libgstefence_la_SOURCES = efence.c
libgstefence_la_CFLAGS = $(GST_CFLAGS)
+libgstefence_la_LIBADD = $(GST_LIBS)
libgstefence_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
# libgstnavigationtest_la_SOURCES = gstnavigationtest.c
diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am
index 12e7ae9b..1413526e 100644
--- a/gst/effectv/Makefile.am
+++ b/gst/effectv/Makefile.am
@@ -1,9 +1,16 @@
-
plugin_LTLIBRARIES = libgsteffectv.la
-libgsteffectv_la_SOURCES = gsteffectv.c gstedge.c gstaging.c gstdice.c gstwarp.c gstshagadelic.c gstvertigo.c gstrev.c gstquark.c
-libgsteffectv_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -I$(top_srcdir)/gst/videofilter
-libgsteffectv_la_LIBADD = $(top_builddir)/gst/videofilter/libgstvideofilter-@GST_MAJORMINOR@.la
-libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_BASE_LIBS)
+libgsteffectv_la_SOURCES = \
+ gsteffectv.c gstedge.c gstaging.c gstdice.c gstwarp.c \
+ gstshagadelic.c gstvertigo.c gstrev.c gstquark.c
+libgsteffectv_la_CFLAGS = \
+ $(GST_PLUGINS_BASE_CFLAGS) \
+ $(GST_CFLAGS) \
+ -I$(top_srcdir)/gst/videofilter
+libgsteffectv_la_LIBADD = \
+ $(GST_PLUGINS_BASE_LIBS) \
+ $(GST_LIBS) \
+ $(top_builddir)/gst/videofilter/libgstvideofilter-@GST_MAJORMINOR@.la
+libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gsteffectv.h
diff --git a/gst/flx/Makefile.am b/gst/flx/Makefile.am
index fd742efa..d26e2dee 100644
--- a/gst/flx/Makefile.am
+++ b/gst/flx/Makefile.am
@@ -1,9 +1,8 @@
-
plugin_LTLIBRARIES = libgstflxdec.la
libgstflxdec_la_SOURCES = gstflxdec.c flx_color.c
libgstflxdec_la_CFLAGS = $(GST_CFLAGS)
-libgstflxdec_la_LIBADD =
+libgstflxdec_la_LIBADD = $(GST_LIBS)
libgstflxdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = flx_fmt.h flx_color.h gstflxdec.h
diff --git a/gst/goom/Makefile.am b/gst/goom/Makefile.am
index 465297f0..98cb0409 100644
--- a/gst/goom/Makefile.am
+++ b/gst/goom/Makefile.am
@@ -3,12 +3,12 @@ plugin_LTLIBRARIES = libgstgoom.la
GOOM_FILTER_FILES = filters.c
GOOM_FILTER_CFLAGS = -UMMX -UUSE_ASM
-libgstgoom_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c lines.c
-
noinst_HEADERS = gstgoom.h filters.h goom_core.h goom_tools.h graphic.h lines.h
-libgstgoom_la_CFLAGS = $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstgoom_la_LIBADD = $(GST_BASE_LIBS)
+libgstgoom_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c lines.c
+
+libgstgoom_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS)
+libgstgoom_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
EXTRA_DIST = filters.c
diff --git a/gst/law/Makefile.am b/gst/law/Makefile.am
index 2a0648f7..b2507b49 100644
--- a/gst/law/Makefile.am
+++ b/gst/law/Makefile.am
@@ -1,14 +1,13 @@
-
plugin_LTLIBRARIES = libgstalaw.la libgstmulaw.la
libgstalaw_la_SOURCES = alaw-encode.c alaw-decode.c alaw.c
libgstalaw_la_CFLAGS = $(GST_CFLAGS)
-libgstalaw_la_LIBADD =
+libgstalaw_la_LIBADD = $(GST_LIBS)
libgstalaw_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstmulaw_la_SOURCES = mulaw-encode.c mulaw-conversion.c mulaw-decode.c mulaw.c
libgstmulaw_la_CFLAGS = $(GST_CFLAGS)
-libgstmulaw_la_LIBADD =
+libgstmulaw_la_LIBADD = $(GST_LIBS)
libgstmulaw_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = mulaw-conversion.h alaw-encode.h alaw-decode.h mulaw-encode.h mulaw-decode.h
diff --git a/gst/matroska/Makefile.am b/gst/matroska/Makefile.am
index 7efb21af..78f2c912 100644
--- a/gst/matroska/Makefile.am
+++ b/gst/matroska/Makefile.am
@@ -16,5 +16,5 @@ noinst_HEADERS = \
matroska-mux.h
libgstmatroska_la_CFLAGS = $(GST_CFLAGS)
-libgstmatroska_la_LIBADD =
+libgstmatroska_la_LIBADD = $(GST_LIBS)
libgstmatroska_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/median/Makefile.am b/gst/median/Makefile.am
index 3d447b02..3920f876 100644
--- a/gst/median/Makefile.am
+++ b/gst/median/Makefile.am
@@ -1,10 +1,9 @@
-
plugin_LTLIBRARIES = libgstmedian.la
libgstmedian_la_SOURCES = gstmedian.c
libgstmedian_la_CFLAGS = $(GST_CFLAGS)
-libgstmedian_la_LIBADD =
+libgstmedian_la_LIBADD = $(GST_LIBS)
libgstmedian_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstmedian.h
diff --git a/gst/monoscope/Makefile.am b/gst/monoscope/Makefile.am
index 97b1f19e..54850009 100644
--- a/gst/monoscope/Makefile.am
+++ b/gst/monoscope/Makefile.am
@@ -1,4 +1,3 @@
-
plugin_LTLIBRARIES = libgstmonoscope.la
libgstmonoscope_la_SOURCES = gstmonoscope.c monoscope.c convolve.c
@@ -6,6 +5,5 @@ libgstmonoscope_la_SOURCES = gstmonoscope.c monoscope.c convolve.c
noinst_HEADERS = monoscope.h convolve.h
libgstmonoscope_la_CFLAGS = $(GST_CFLAGS)
-libgstmonoscope_la_LIBADD =
+libgstmonoscope_la_LIBADD = $(GST_LIBS)
libgstmonoscope_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
diff --git a/gst/multipart/Makefile.am b/gst/multipart/Makefile.am
index c4dcd4d5..7dfb9c2b 100644
--- a/gst/multipart/Makefile.am
+++ b/gst/multipart/Makefile.am
@@ -2,5 +2,5 @@ plugin_LTLIBRARIES = libgstmultipart.la
libgstmultipart_la_SOURCES = multipart.c multipartdemux.c multipartmux.c
libgstmultipart_la_CFLAGS = $(GST_CFLAGS)
-libgstmultipart_la_LIBADD =
+libgstmultipart_la_LIBADD = $(GST_LIBS)
libgstmultipart_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/oldcore/Makefile.am b/gst/oldcore/Makefile.am
index f2f5c499..6b7e33bf 100644
--- a/gst/oldcore/Makefile.am
+++ b/gst/oldcore/Makefile.am
@@ -12,7 +12,7 @@ libgststandardelements_la_SOURCES = \
gststatistics.c
libgststandardelements_la_CFLAGS = $(GST_CFLAGS)
-libgststandardelements_la_LIBADD =
+libgststandardelements_la_LIBADD = $(GST_LIBS)
libgststandardelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index 151b3ef1..533842e7 100644
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -15,10 +15,10 @@ libgstrtp_la_SOURCES = gstrtp.c \
#gstrtpL16enc.c gstrtpL16parse.c gstrtpgsmenc.c gstrtpgsmparse.c
-libgstrtp_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrtp_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-lgstrtp-@GST_MAJORMINOR@
+libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstrtpL16enc.h \
gstrtpL16parse.h \
diff --git a/gst/rtsp/Makefile.am b/gst/rtsp/Makefile.am
index 4d209646..f2606183 100644
--- a/gst/rtsp/Makefile.am
+++ b/gst/rtsp/Makefile.am
@@ -1,4 +1,3 @@
-
plugin_LTLIBRARIES = libgstrtsp.la
libgstrtsp_la_SOURCES = gstrtsp.c gstrtspsrc.c \
@@ -10,7 +9,7 @@ libgstrtsp_la_SOURCES = gstrtsp.c gstrtspsrc.c \
sdpmessage.c
libgstrtsp_la_CFLAGS = $(GST_CFLAGS)
-libgstrtsp_la_LIBADD =
+libgstrtsp_la_LIBADD = $(GST_LIBS)
libgstrtsp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
check_PROGRAMS = test
diff --git a/gst/smoothwave/Makefile.am b/gst/smoothwave/Makefile.am
index d7312a4f..914d065c 100644
--- a/gst/smoothwave/Makefile.am
+++ b/gst/smoothwave/Makefile.am
@@ -1,9 +1,8 @@
-
plugin_LTLIBRARIES = libgstsmoothwave.la
libgstsmoothwave_la_SOURCES = gstsmoothwave.c
libgstsmoothwave_la_CFLAGS = $(GST_CFLAGS)
-libgstsmoothwave_la_LIBADD =
+libgstsmoothwave_la_LIBADD = $(GST_LIBS)
libgstsmoothwave_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstsmoothwave.h
diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am
index add5327d..4a5d58af 100644
--- a/gst/smpte/Makefile.am
+++ b/gst/smpte/Makefile.am
@@ -4,6 +4,6 @@ libgstsmpte_la_SOURCES = gstsmpte.c gstmask.c barboxwipes.c paint.c
noinst_HEADERS = gstsmpte.h gstmask.h paint.h
-libgstsmpte_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+libgstsmpte_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstsmpte_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS)
libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/videobox/Makefile.am b/gst/videobox/Makefile.am
index 72b5c23d..a077cf16 100644
--- a/gst/videobox/Makefile.am
+++ b/gst/videobox/Makefile.am
@@ -1,4 +1,3 @@
-
plugin_LTLIBRARIES = libgstvideobox.la
libgstvideobox_la_SOURCES = gstvideobox.c
@@ -6,6 +5,4 @@ libgstvideobox_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstvideobox_la_LIBADD = $(GST_BASE_LIBS)
libgstvideobox_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-noinst_HEADERS =
-
EXTRA_DIST = README
diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am
index 1a4b9c27..2cc94db8 100644
--- a/gst/videofilter/Makefile.am
+++ b/gst/videofilter/Makefile.am
@@ -13,12 +13,12 @@ libgstvideofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS)
libgstvideoexample_la_SOURCES = gstvideoexample.c
libgstvideoexample_la_CFLAGS = $(GST_CFLAGS)
-libgstvideoexample_la_LIBADD = libgstvideofilter-@GST_MAJORMINOR@.la
+libgstvideoexample_la_LIBADD = libgstvideofilter-@GST_MAJORMINOR@.la $(GST_LIBS)
libgstvideoexample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstvideoflip_la_SOURCES = gstvideoflip.c
libgstvideoflip_la_CFLAGS = $(GST_CFLAGS)
-libgstvideoflip_la_LIBADD = libgstvideofilter-@GST_MAJORMINOR@.la
+libgstvideoflip_la_LIBADD = libgstvideofilter-@GST_MAJORMINOR@.la $(GST_LIBS)
libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
# libgstvideobalance_la_SOURCES = gstvideobalance.c
diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am
index b18c50f8..c64c3d0d 100644
--- a/gst/videomixer/Makefile.am
+++ b/gst/videomixer/Makefile.am
@@ -2,5 +2,5 @@ plugin_LTLIBRARIES = libgstvideomixer.la
libgstvideomixer_la_SOURCES = videomixer.c
libgstvideomixer_la_CFLAGS = $(GST_CFLAGS)
-libgstvideomixer_la_LIBADD =
+libgstvideomixer_la_LIBADD = $(GST_LIBS)
libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/wavenc/Makefile.am b/gst/wavenc/Makefile.am
index d1e9148a..c90a2778 100644
--- a/gst/wavenc/Makefile.am
+++ b/gst/wavenc/Makefile.am
@@ -1,9 +1,8 @@
-
plugin_LTLIBRARIES = libgstwavenc.la
libgstwavenc_la_SOURCES = gstwavenc.c
libgstwavenc_la_CFLAGS = $(GST_CFLAGS)
-libgstwavenc_la_LIBADD =
+libgstwavenc_la_LIBADD = $(GST_LIBS)
libgstwavenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstwavenc.h riff.h
diff --git a/gst/wavparse/Makefile.am b/gst/wavparse/Makefile.am
index a99aea98..006eaf11 100644
--- a/gst/wavparse/Makefile.am
+++ b/gst/wavparse/Makefile.am
@@ -1,12 +1,9 @@
-
plugin_LTLIBRARIES = libgstwavparse.la
libgstwavparse_la_SOURCES = gstwavparse.c
-libgstwavparse_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
+libgstwavparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
-I$(top_srcdir)/gst-libs
-libgstwavparse_la_LIBADD = -lgstriff-@GST_MAJORMINOR@
-libgstwavparse_la_LDFLAGS = \
- $(GST_PLUGIN_LDFLAGS) \
- $(GST_PLUGINS_BASE_LIBS)
+libgstwavparse_la_LIBADD = -lgstriff-@GST_MAJORMINOR@ $(GST_PLUGINS_BASE_LIBS)
+libgstwavparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstwavparse.h