diff options
45 files changed, 147 insertions, 105 deletions
@@ -1,3 +1,59 @@ +2005-09-23 Thomas Vander Stichele <thomas at apestaart dot org> + + * gst/auparse/Makefile.am: + * gst/auparse/gstauparse.c: (gst_auparse_chain): + fix up build + * configure.ac: + * ext/cairo/Makefile.am: + * ext/dv/Makefile.am: + * ext/esd/Makefile.am: + * ext/flac/Makefile.am: + * ext/gconf/Makefile.am: + * ext/gdk_pixbuf/Makefile.am: + * ext/jpeg/Makefile.am: + * ext/ladspa/Makefile.am: + * ext/libcaca/Makefile.am: + * ext/libmng/Makefile.am: + * ext/libpng/Makefile.am: + * ext/mikmod/Makefile.am: + * ext/pango/Makefile.am: + * ext/raw1394/Makefile.am: + * ext/shout2/Makefile.am: + * ext/speex/Makefile.am: + * gst/alpha/Makefile.am: + * gst/autodetect/Makefile.am: + * gst/avi/Makefile.am: + * gst/cutter/Makefile.am: + * gst/debug/Makefile.am: + * gst/effectv/Makefile.am: + * gst/flx/Makefile.am: + * gst/goom/Makefile.am: + * gst/interleave/Makefile.am: + * gst/law/Makefile.am: + * gst/matroska/Makefile.am: + * gst/median/Makefile.am: + * gst/monoscope/Makefile.am: + * gst/multipart/Makefile.am: + * gst/oldcore/Makefile.am: + * gst/rtp/Makefile.am: + * gst/rtsp/Makefile.am: + * gst/smoothwave/Makefile.am: + * gst/smpte/Makefile.am: + * gst/videobox/Makefile.am: + * gst/videofilter/Makefile.am: + * gst/videomixer/Makefile.am: + * gst/wavenc/Makefile.am: + * gst/wavparse/Makefile.am: + * sys/oss/Makefile.am: + * sys/osxaudio/Makefile.am: + * sys/osxvideo/Makefile.am: + fix up GST_LIBS use + +2005-09-23 Thomas Vander Stichele <thomas at apestaart dot org> + + * gst/auparse/Makefile.am: + * gst/auparse/gstauparse.c: (gst_auparse_chain): + fix build of auparse 2005-09-22 Edgard Lima (edgard.lima@indt.org.br) diff --git a/configure.ac b/configure.ac index 07e67f3b..d42a4b61 100644 --- a/configure.ac +++ b/configure.ac @@ -259,7 +259,7 @@ dnl =========================================================================== plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR" AC_SUBST(plugindir) -GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '[_]*(gst_|Gst|GST_).*' $GST_LIBS" +GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '[_]*(gst_|Gst|GST_).*'" AC_SUBST(GST_PLUGIN_LDFLAGS) dnl these are all the gst plug-ins, compilable without additional libs diff --git a/ext/cairo/Makefile.am b/ext/cairo/Makefile.am index 8e80b626..92884d53 100644 --- a/ext/cairo/Makefile.am +++ b/ext/cairo/Makefile.am @@ -9,6 +9,6 @@ libgstcairo_la_SOURCES = \ gstcairo.c libgstcairo_la_CFLAGS = $(GST_CFLAGS) $(CAIRO_CFLAGS) \ -I$(top_srcdir)/gst/videofilter -libgstcairo_la_LIBADD = -libgstcairo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(CAIRO_LIBS) -lm +libgstcairo_la_LIBADD = $(GST_LIBS) $(CAIRO_LIBS) -lm +libgstcairo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am index 144daabe..6352ca58 100644 --- a/ext/dv/Makefile.am +++ b/ext/dv/Makefile.am @@ -1,10 +1,9 @@ - plugin_LTLIBRARIES = libgstdv.la libgstdv_la_SOURCES = gstdv.c gstdvdec.c gstdvdemux.c libgstdv_la_CFLAGS = $(GST_CFLAGS) $(LIBDV_CFLAGS) -libgstdv_la_LIBADD = $(LIBDV_LIBS) $(GST_BASE_LIBS) -libgstdv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_BASE_LIBS) +libgstdv_la_LIBADD = $(GST_BASE_LIBS) $(LIBDV_LIBS) +libgstdv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstdvdemux.h gstdvdec.h diff --git a/ext/esd/Makefile.am b/ext/esd/Makefile.am index 492c9e03..fd2ee4bc 100644 --- a/ext/esd/Makefile.am +++ b/ext/esd/Makefile.am @@ -1,10 +1,9 @@ - plugin_LTLIBRARIES = libgstesd.la libgstesd_la_SOURCES = esdsink.c gstesd.c #esdmon.c -libgstesd_la_CFLAGS = $(GST_CFLAGS) $(ESD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstesd_la_LIBADD = $(ESD_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ +libgstesd_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstesd_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ $(ESD_LIBS) libgstesd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = esdsink.h esdmon.h diff --git a/ext/flac/Makefile.am b/ext/flac/Makefile.am index 191e2ee5..bd83fbd1 100644 --- a/ext/flac/Makefile.am +++ b/ext/flac/Makefile.am @@ -1,10 +1,9 @@ - plugin_LTLIBRARIES = libgstflac.la libgstflac_la_SOURCES = gstflac.c gstflacdec.c #gstflacenc.c gstflactag.c libgstflac_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir) -libgstflac_la_LIBADD = $(FLAC_LIBS) +libgstflac_la_LIBADD = $(GST_LIBS) $(FLAC_LIBS) libgstflac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstflacenc.h gstflacdec.h flac_compat.h gstflactag.h diff --git a/ext/gconf/Makefile.am b/ext/gconf/Makefile.am index 4e23b174..688d38a0 100644 --- a/ext/gconf/Makefile.am +++ b/ext/gconf/Makefile.am @@ -8,7 +8,7 @@ libgstgconfelements_la_SOURCES = \ DIR_CFLAGS = -DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\" libgstgconfelements_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS) -libgstgconfelements_la_LIBADD = $(GCONF_LIBS) +libgstgconfelements_la_LIBADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconfelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am index 54e9a3ee..ac18389a 100644 --- a/ext/gdk_pixbuf/Makefile.am +++ b/ext/gdk_pixbuf/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstgdkpixbuf.la libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c pixbufscale.c libgstgdkpixbuf_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -libgstgdkpixbuf_la_LIBADD = $(GTK_LIBS) +libgstgdkpixbuf_la_LIBADD = $(GST_LIBS) $(GTK_LIBS) libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) if HAVE_GDK_LOADERS @@ -19,7 +19,7 @@ gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND gst_loader_la_SOURCES = \ gstgdkanimation.c \ gst_loader.c -gst_loader_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) --avoid-version --module +gst_loader_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) gst_loader_la_LIBADD = $(GTK_LIBS) $(GST_LIBS) else install-data-hook: diff --git a/ext/jpeg/Makefile.am b/ext/jpeg/Makefile.am index eb813e4b..e7c88f1c 100644 --- a/ext/jpeg/Makefile.am +++ b/ext/jpeg/Makefile.am @@ -1,4 +1,3 @@ - plugin_LTLIBRARIES = libgstjpeg.la libgstjpeg_la_SOURCES = \ @@ -10,8 +9,8 @@ libgstjpeg_la_SOURCES = \ # gstsmokedec.c -libgstjpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstjpeg_la_LIBADD = $(JPEG_LIBS) +libgstjpeg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstjpeg_la_LIBADD = $(GST_LIBS) $(JPEG_LIBS) libgstjpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am index ce5302d5..9ec52c11 100644 --- a/ext/ladspa/Makefile.am +++ b/ext/ladspa/Makefile.am @@ -1,8 +1,7 @@ - plugin_LTLIBRARIES = libgstladspa.la libgstladspa_la_SOURCES = gstsignalprocessor.c gstladspa.c search.c load.c -libgstladspa_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) +libgstladspa_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstladspa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am index ef83e50c..0f3fdf38 100644 --- a/ext/libcaca/Makefile.am +++ b/ext/libcaca/Makefile.am @@ -1,10 +1,11 @@ - plugin_LTLIBRARIES = libgstcacasink.la -libgstcacasink_la_SOURCES = gstcacasink.c -libgstcacasink_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(LIBCACA_CFLAGS) -libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) #\ - #$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la -libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) +libgstcacasink_la_SOURCES = gstcacasink.c +libgstcacasink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBCACA_CFLAGS) +libgstcacasink_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) \ + $(LIBCACA_LIBS) +libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstcacasink.h diff --git a/ext/libmng/Makefile.am b/ext/libmng/Makefile.am index 8936bc3f..6fdd8580 100644 --- a/ext/libmng/Makefile.am +++ b/ext/libmng/Makefile.am @@ -1,4 +1,3 @@ - plugin_LTLIBRARIES = libgstmng.la libgstmng_la_SOURCES = gstmng.c gstmngdec.c gstmngenc.c diff --git a/ext/libpng/Makefile.am b/ext/libpng/Makefile.am index d157652c..911a3b80 100644 --- a/ext/libpng/Makefile.am +++ b/ext/libpng/Makefile.am @@ -1,8 +1,7 @@ - plugin_LTLIBRARIES = libgstpng.la libgstpng_la_SOURCES = gstpng.c gstpngenc.c # gstpngdec.c -libgstpng_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) +libgstpng_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstpng_la_LIBADD = $(GST_LIBS) $(LIBPNG_LIBS) libgstpng_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/mikmod/Makefile.am b/ext/mikmod/Makefile.am index be7814c0..d2be0051 100644 --- a/ext/mikmod/Makefile.am +++ b/ext/mikmod/Makefile.am @@ -1,9 +1,8 @@ - plugin_LTLIBRARIES = libgstmikmod.la libgstmikmod_la_SOURCES = gstmikmod.c drv_gst.c mikmod_reader.c libgstmikmod_la_CFLAGS = $(GST_CFLAGS) $(MIKMOD_CFLAGS) -libgstmikmod_la_LIBADD = $(MIKMOD_LIBS) +libgstmikmod_la_LIBADD = $(GST_LIBS) $(MIKMOD_LIBS) libgstmikmod_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstmikmod.h diff --git a/ext/pango/Makefile.am b/ext/pango/Makefile.am index 2ec7e4ea..55bee7b8 100644 --- a/ext/pango/Makefile.am +++ b/ext/pango/Makefile.am @@ -1,4 +1,3 @@ - #PANGO_CFLAGS = -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 #PANGO_LDFLAGS = -Wl,--export-dynamic -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 @@ -8,10 +7,10 @@ noinst_HEADERS = gsttimeoverlay.h gsttextoverlay.h libgsttimeoverlay_la_SOURCES = gsttimeoverlay.c libgsttimeoverlay_la_CFLAGS = $(GST_CFLAGS) $(PANGO_CFLAGS) -I$(top_srcdir)/gst/videofilter -libgsttimeoverlay_la_LIBADD = -libgsttimeoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(PANGO_LIBS) -lm +libgsttimeoverlay_la_LIBADD = $(GST_LIBS) $(PANGO_LIBS) -lm +libgsttimeoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgsttextoverlay_la_SOURCES = gsttextoverlay.c libgsttextoverlay_la_CFLAGS = $(GST_CFLAGS) $(PANGO_CFLAGS) -libgsttextoverlay_la_LIBADD = -libgsttextoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(PANGO_LIBS) +libgsttextoverlay_la_LIBADD = $(GST_LIBS) $(PANGO_LIBS) +libgsttextoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/raw1394/Makefile.am b/ext/raw1394/Makefile.am index cdaad3c6..73082d27 100644 --- a/ext/raw1394/Makefile.am +++ b/ext/raw1394/Makefile.am @@ -1,9 +1,8 @@ - plugin_LTLIBRARIES = libgst1394.la libgst1394_la_SOURCES = gst1394.c gstdv1394src.c libgst1394_la_CFLAGS = $(GST_CFLAGS) -libgst1394_la_LIBADD = $(DV1394_LIBS) -libgst1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) +libgst1394_la_LIBADD = $(GST_BASE_LIBS) $(DV1394_LIBS) +libgst1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstdv1394src.h diff --git a/ext/shout2/Makefile.am b/ext/shout2/Makefile.am index 021799bf..43887811 100644 --- a/ext/shout2/Makefile.am +++ b/ext/shout2/Makefile.am @@ -1,9 +1,8 @@ - plugin_LTLIBRARIES = libgstshout2.la libgstshout2_la_SOURCES = gstshout2.c -libgstshout2_la_CFLAGS = $(SHOUT2_CFLAGS) $(GST_CFLAGS) -libgstshout2_la_LIBADD = $(SHOUT2_LIBS) $(GST_LIBS) $(GST_BASE_LIBS) +libgstshout2_la_CFLAGS = $(GST_CFLAGS) $(SHOUT2_CFLAGS) +libgstshout2_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SHOUT2_LIBS) libgstshout2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstshout2.h diff --git a/ext/speex/Makefile.am b/ext/speex/Makefile.am index 2f3205bd..00be9098 100644 --- a/ext/speex/Makefile.am +++ b/ext/speex/Makefile.am @@ -1,10 +1,9 @@ - plugin_LTLIBRARIES = libgstspeex.la libgstspeex_la_SOURCES = gstspeex.c gstspeexdec.c #gstspeexenc.c libgstspeex_la_CFLAGS = $(GST_CFLAGS) $(SPEEX_CFLAGS) -libgstspeex_la_LIBADD = $(SPEEX_LIBS) +libgstspeex_la_LIBADD = $(GST_LIBS) $(SPEEX_LIBS) libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstspeexenc.h gstspeexdec.h 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 diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am index 9c797cf8..f7dc0aa5 100644 --- a/sys/oss/Makefile.am +++ b/sys/oss/Makefile.am @@ -10,10 +10,12 @@ libgstossaudio_la_SOURCES = gstossaudio.c \ # gstossdmabuffer.c -libgstossaudio_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstossaudio_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstinterfaces-@GST_MAJORMINOR@ \ - -lgstaudio-@GST_MAJORMINOR@ +libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstossaudio_la_LIBADD = \ + -lgstinterfaces-@GST_MAJORMINOR@ \ + -lgstaudio-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_LIBS) libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstosssink.h \ diff --git a/sys/osxaudio/Makefile.am b/sys/osxaudio/Makefile.am index 0b65f38f..0744f450 100644 --- a/sys/osxaudio/Makefile.am +++ b/sys/osxaudio/Makefile.am @@ -1,12 +1,13 @@ plugin_LTLIBRARIES = libgstosxaudio.la -libgstosxaudio_la_SOURCES = gstosxaudio.c \ +libgstosxaudio_la_SOURCES = gstosxaudio.c \ gstosxaudioelement.c \ gstosxaudiosink.c \ gstosxaudiosrc.c +# FIXME: clean up these linker flags libgstosxaudio_la_CFLAGS = $(GST_CFLAGS) -libgstosxaudio_la_LIBADD = $(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la +libgstosxaudio_la_LIBADD = $(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la $(GST_LIBS) LIBS = -Wl,-framework -Wl,CoreAudio libgstosxaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -framework CoreAudio |