diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2005-09-23 04:23:00 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2005-09-23 04:23:00 +0000 |
commit | 7593b38a57f55c28cdb4b8c3df27a13c6ce55d99 (patch) | |
tree | 13d564ed48fa161cc87f9dffaf6efa4152aa3dab /ext | |
parent | 50bdf8c4623926eadd834e463357077bba0eec90 (diff) |
fix build and use of GST_LIBS
Original commit message from CVS:
fix build and use of GST_LIBS
Diffstat (limited to 'ext')
-rw-r--r-- | ext/cairo/Makefile.am | 4 | ||||
-rw-r--r-- | ext/dv/Makefile.am | 5 | ||||
-rw-r--r-- | ext/esd/Makefile.am | 5 | ||||
-rw-r--r-- | ext/flac/Makefile.am | 3 | ||||
-rw-r--r-- | ext/gconf/Makefile.am | 2 | ||||
-rw-r--r-- | ext/gdk_pixbuf/Makefile.am | 4 | ||||
-rw-r--r-- | ext/jpeg/Makefile.am | 5 | ||||
-rw-r--r-- | ext/ladspa/Makefile.am | 3 | ||||
-rw-r--r-- | ext/libcaca/Makefile.am | 13 | ||||
-rw-r--r-- | ext/libmng/Makefile.am | 1 | ||||
-rw-r--r-- | ext/libpng/Makefile.am | 3 | ||||
-rw-r--r-- | ext/mikmod/Makefile.am | 3 | ||||
-rw-r--r-- | ext/pango/Makefile.am | 9 | ||||
-rw-r--r-- | ext/raw1394/Makefile.am | 5 | ||||
-rw-r--r-- | ext/shout2/Makefile.am | 5 | ||||
-rw-r--r-- | ext/speex/Makefile.am | 3 |
16 files changed, 31 insertions, 42 deletions
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 |