diff options
-rw-r--r-- | ChangeLog | 20 | ||||
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | configure.ac | 131 | ||||
-rw-r--r-- | ext/annodex/Makefile.am | 9 | ||||
-rw-r--r-- | ext/cdio/Makefile.am | 8 | ||||
-rw-r--r-- | ext/dv/Makefile.am | 14 | ||||
-rw-r--r-- | ext/esd/Makefile.am | 5 | ||||
-rw-r--r-- | ext/flac/Makefile.am | 10 | ||||
-rw-r--r-- | ext/gdk_pixbuf/Makefile.am | 34 | ||||
-rw-r--r-- | ext/ladspa/Makefile.am | 2 | ||||
-rw-r--r-- | ext/libcaca/Makefile.am | 5 | ||||
-rw-r--r-- | ext/speex/Makefile.am | 14 | ||||
-rw-r--r-- | ext/taglib/Makefile.am | 6 | ||||
-rw-r--r-- | sys/oss/Makefile.am | 13 | ||||
-rw-r--r-- | sys/sunaudio/Makefile.am | 4 | ||||
-rw-r--r-- | sys/ximage/Makefile.am | 3 |
16 files changed, 113 insertions, 167 deletions
@@ -1,3 +1,23 @@ +2006-06-11 Thomas Vander Stichele <thomas at apestaart dot org> + + * autogen.sh: + require am17 + * configure.ac: + * ext/annodex/Makefile.am: + * ext/cdio/Makefile.am: + * ext/dv/Makefile.am: + * ext/esd/Makefile.am: + * ext/flac/Makefile.am: + * ext/gdk_pixbuf/Makefile.am: + * ext/ladspa/Makefile.am: + * ext/libcaca/Makefile.am: + * ext/speex/Makefile.am: + * ext/taglib/Makefile.am: + * sys/oss/Makefile.am: + * sys/sunaudio/Makefile.am: + * sys/ximage/Makefile.am: + clean up build further + 2006-06-09 Tim-Philipp Müller <tim at centricular dot net> * gconf/Makefile.am: @@ -34,7 +34,7 @@ if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autoconf-2.52" \ "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 version_check "automake" "$AUTOMAKE automake automake-1.9 automake-1.7 automake-1.6 automake-1.5" \ - "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || DIE=1 + "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1 version_check "autopoint" "autopoint" \ "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1 version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \ diff --git a/configure.ac b/configure.ac index 24686701..b187c366 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,10 @@ AC_PREREQ(2.52) +dnl please read gstreamer/docs/random/autotools before changing this file + dnl initialize autoconf -dnl when going to/from release please set the nano (fourth number) right ! -dnl releases only do Wall, cvs and prerelease does Werror too +dnl releases only do -Wall, cvs and prerelease does -Werror too +dnl use a three digit version number for releases, and four for cvs/pre AC_INIT(GStreamer Good Plug-ins, 0.10.3.1, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-plugins-good) @@ -315,7 +317,7 @@ echo dnl *** OSS audio *** (Linux, *BSD) translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true) -GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [ +GST_CHECK_FEATURE(OSS, [OSS audio], ossaudio, [ HAVE_OSS="yes" dnl Linux and newer BSD versions : AC_CHECK_HEADER(sys/soundcard.h, [ @@ -338,7 +340,7 @@ dnl Some old BSD versions and also newer OpenBSD versions : dnl *** Sun Audio *** translit(dnm, m, l) AM_CONDITIONAL(USE_SUNAUDIO, true) -GST_CHECK_FEATURE(SUNAUDIO, [Sun Audio], sunaudiosink, [ +GST_CHECK_FEATURE(SUNAUDIO, [Sun Audio], sunaudio, [ AC_CHECK_HEADER(sys/audioio.h, HAVE_SUNAUDIO="yes", HAVE_SUNAUDIO="no") ]) @@ -396,7 +398,7 @@ dnl feature of the ximagesrc plug-in dnl This is the same as in gst-plugins-base dnl check for X Shm translit(dnm, m, l) AM_CONDITIONAL(USE_XSHM, true) -GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], [], [ +GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], , [ if test x$HAVE_X = xyes; then AC_CHECK_LIB(Xext, XShmAttach, HAVE_XSHM="yes", HAVE_XSHM="no", @@ -429,63 +431,43 @@ echo dnl *** aalib *** translit(dnm, m, l) AM_CONDITIONAL(USE_AALIB, true) -GST_CHECK_FEATURE(AALIB, [aasink plug-in], aasink, [ +GST_CHECK_FEATURE(AALIB, [aalib ASCII Art library], aasink, [ AM_PATH_AALIB(, HAVE_AALIB=yes, HAVE_AALIB=no) AS_SCRUB_INCLUDE(AALIB_CFLAGS) ]) dnl *** annodex *** translit(dnm, m, l) AM_CONDITIONAL(USE_ANNODEX, true) -GST_CHECK_FEATURE(ANNODEX, [annodex plug-in], skeldec cmmlenc cmmldec, [ - PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.4.9, [ - HAVE_ANNODEX=yes - AC_SUBST(XML_CFLAGS) - AC_SUBST(XML_LIBS) - ], [ - HAVE_ANNODEX=no - ]) +GST_CHECK_FEATURE(ANNODEX, [XML library], annodex, [ + GST_PKG_CHECK_MODULES(ANNODEX, libxml-2.0 >= 2.4.9) ]) dnl *** cairo *** translit(dnm, m, l) AM_CONDITIONAL(USE_CAIRO, true) -GST_CHECK_FEATURE(CAIRO, [cairo plug-in], cairo, [ - PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0, [ - HAVE_CAIRO=yes - AC_SUBST(CAIRO_CFLAGS) - AC_SUBST(CAIRO_LIBS) - ], [ - HAVE_CAIRO=no - ]) +GST_CHECK_FEATURE(CAIRO, [Cairo graphics rendering], cairo, [ + GST_PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0) ]) dnl *** cdio *** translit(dnm, m, l) AM_CONDITIONAL(USE_CDIO, true) GST_CHECK_FEATURE(CDIO, [cdio library], cdio, [ - PKG_CHECK_MODULES(CDIO, libcdio >= 0.71, [ - HAVE_CDIO=yes - AC_SUBST(CDIO_CFLAGS) - AC_SUBST(CDIO_LIBS) - ], [ - HAVE_CDIO=no - ]) + GST_PKG_CHECK_MODULES(CDIO, libcdio >= 0.71) ]) dnl **** ESound **** translit(dnm, m, l) AM_CONDITIONAL(USE_ESD, true) -GST_CHECK_FEATURE(ESD, [esound plug-ins], esdsink, [ - PKG_CHECK_MODULES(ESD, esound >= 0.2.12, [ - HAVE_ESD="yes" - AC_SUBST(ESD_CFLAGS) - AC_SUBST(ESD_LIBS) - ], [ - AM_PATH_ESD(0.2.12, HAVE_ESD="yes", HAVE_ESD="no") +GST_CHECK_FEATURE(ESD, [ESounD sound daemon], esdsink, [ + GST_PKG_CHECK_MODULES(ESD, esound >= 0.2.12) + if test $HAVE_ESD = no + then + AM_PATH_ESD(0.2.12, HAVE_ESD="yes") AS_SCRUB_INCLUDE(ESD_CFLAGS) - ]) + fi ]) dnl *** FLAC *** translit(dnm, m, l) AM_CONDITIONAL(USE_FLAC, true) -GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [ +GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac, [ GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__seekable_stream_encoder_new, -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -lm") dnl API change in FLAC 1.1.1, so require that... if test x$HAVE_FLAC = xyes; then @@ -499,30 +481,26 @@ GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [ dnl *** GConf *** translit(dnm, m, l) AM_CONDITIONAL(USE_GCONF, true) -GST_CHECK_FEATURE(GCONF, [GConf libraries], , [ - PKG_CHECK_MODULES(GCONF, gconf-2.0, HAVE_GCONF="yes", HAVE_GCONF="no") - AC_SUBST(GCONF_CFLAGS) - AC_SUBST(GCONF_LIBS) +GST_CHECK_FEATURE(GCONF, [GConf libraries], gconfelements, [ + GST_PKG_CHECK_MODULES(GCONF, gconf-2.0) ]) dnl *** GDK pixbuf *** translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true) -GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbufsrc, [ +GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbuf, [ if test $HAVE_GTK_22 = "yes"; then HAVE_GDK_PIXBUF=yes; fi; ]) dnl *** HAL *** translit(dnm, m, l) AM_CONDITIONAL(USE_HAL, true) -GST_CHECK_FEATURE(HAL, [HAL libraries], , [ - PKG_CHECK_MODULES(HAL, [hal >= 0.5.6, dbus-1 >= 0.32], HAVE_HAL="yes", HAVE_HAL="no") - AC_SUBST(HAL_CFLAGS) - AC_SUBST(HAL_LIBS) +GST_CHECK_FEATURE(HAL, [HAL libraries], halelements, [ + GST_PKG_CHECK_MODULES(HAL, [hal >= 0.5.6, dbus-1 >= 0.32]) ]) dnl *** jpeg *** dnl FIXME: we could use header checks here as well IMO translit(dnm, m, l) AM_CONDITIONAL(USE_JPEG, true) -GST_CHECK_FEATURE(JPEG, [jpeg], jpegenc jpegdec, [ +GST_CHECK_FEATURE(JPEG, [jpeg library], jpeg, [ AC_ARG_WITH(jpeg-mmx, [ --with-jpeg-mmx, path to MMX'ified JPEG library]) OLD_LIBS="$LIBS" @@ -547,7 +525,7 @@ GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [ dnl *** libcaca *** translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true) -GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [ +GST_CHECK_FEATURE(LIBCACA, [libcaca coloured ASCII art], cacasink, [ GST_CHECK_CONFIGPROG(LIBCACA, caca-config) AC_SUBST(LIBCACA_CFLAGS) AC_SUBST(LIBCACA_LIBS) @@ -555,34 +533,28 @@ GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [ dnl *** libdv *** translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true) -GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [ - PKG_CHECK_MODULES(LIBDV, libdv >= 0.100, HAVE_LIBDV="yes", HAVE_LIBDV="no") - AC_SUBST(LIBDV_CFLAGS) - AC_SUBST(LIBDV_LIBS) +GST_CHECK_FEATURE(LIBDV, [libdv DV demuxer/decoder], dv, [ + GST_PKG_CHECK_MODULES(LIBDV, libdv >= 0.100) ]) dnl *** libpng *** translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true) -GST_CHECK_FEATURE(LIBPNG, [libpng PNG encoder], pngenc, [ - PKG_CHECK_MODULES(LIBPNG, libpng12, HAVE_LIBPNG="yes", HAVE_LIBPNG="no") - AC_SUBST(LIBPNG_CFLAGS) - AC_SUBST(LIBPNG_LIBS) +GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [ + GST_PKG_CHECK_MODULES(LIBPNG, libpng12) ]) dnl *** dv1394 *** translit(dnm, m, l) AM_CONDITIONAL(USE_DV1394, true) -GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], dv1394src, [ +GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], 1394, [ dnl we need to test three headers and three libs - PKG_CHECK_MODULES(RAW1394, - libraw1394 >= 1.1.0, HAVE_RAW1394="yes", HAVE_RAW1394="no") + GST_PKG_CHECK_MODULES(RAW1394, libraw1394 >= 1.1.0) GST_CHECK_LIBHEADER(AVC1394, avc1394, avc1394_send_command, $RAW1394_LIBS, libavc1394/avc1394.h, AVC1394_LIBS="-lavc1394") GST_CHECK_LIBHEADER(ROM1394, rom1394, rom1394_free_directory, $RAW1394_LIBS, libavc1394/rom1394.h, ROM1394_LIBS="-lrom1394") - PKG_CHECK_MODULES(LIBIEC61883, libiec61883 >= 1.0.0, HAVE_LIBIEC61883="yes", - HAVE_LIBIEC61883="no") + GST_PKG_CHECK_MODULES(LIBIEC61883, libiec61883 >= 1.0.0) dnl now see how far we got if test x$HAVE_RAW1394 = xyes && \ test x$HAVE_AVC1394 = xyes && \ @@ -604,16 +576,14 @@ GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], dv1394src, [ dnl *** shout2 *** translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true) -GST_CHECK_FEATURE(SHOUT2, [shout2 plug-in], shout2send, [ - PKG_CHECK_MODULES(SHOUT2, shout >= 2.0, [ - HAVE_SHOUT2="yes" - AC_SUBST(SHOUT2_CFLAGS) - AC_SUBST(SHOUT2_LIBS) - ], [ - AM_PATH_SHOUT2(HAVE_SHOUT2="yes", HAVE_SHOUT2="no") +GST_CHECK_FEATURE(SHOUT2, [Shoutcast/Icecast client library], shout2, [ + GST_PKG_CHECK_MODULES(SHOUT2, shout >= 2.0) + if test $HAVE_SHOUT2 = no + then + AM_PATH_SHOUT2(HAVE_SHOUT2="yes") AC_SUBST(SHOUT2_CFLAGS) AC_SUBST(SHOUT2_LIBS) - ]) + fi ]) dnl *** speex >= 1.0.4 or >= 1.1.5 *** @@ -621,12 +591,10 @@ dnl 1.1.4 and earlier were not API/ABI compatible with 1.0 dnl 1.1.6 is the first to use a .pc/pkg-config file *** dnl speex_jitter.h is 1.1.x only translit(dnm, m, l) AM_CONDITIONAL(USE_SPEEX, true) -GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [ - PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6, [ - HAVE_SPEEX="yes" - AC_SUBST(SPEEX_CFLAGS) - AC_SUBST(SPEEX_LIBS) - ], [ +GST_CHECK_FEATURE(SPEEX, [speex speech codec], speex, [ + GST_PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6) + if test $HAVE_SPEEX = no + then GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex/speex.h, [ AC_CHECK_HEADER(speex/speex_jitter.h, [ dnl speex 1.1.x : @@ -658,18 +626,13 @@ GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [ ]) ]) ]) - ]) + fi ]) dnl *** taglib *** translit(dnm, m, l) AM_CONDITIONAL(USE_TAGLIB, true) -GST_CHECK_FEATURE(TAGLIB, [taglib ID3v2 tag writer], taglib, [ - PKG_CHECK_MODULES(TAGLIB, taglib >= 1.4, HAVE_TAGLIB="yes", [ - HAVE_TAGLIB="no" - AC_MSG_RESULT(no) - ]) - AC_SUBST(TAGLIB_CFLAGS) - AC_SUBST(TAGLIB_LIBS) +GST_CHECK_FEATURE(TAGLIB, [taglib tagging library], taglib, [ + GST_PKG_CHECK_MODULES(TAGLIB, taglib >= 1.4) if test "x$HAVE_CXX" != "xyes"; then USE_TAGLIB=false AC_MSG_NOTICE([Not building taglib plugin: no C++ compiler found]) diff --git a/ext/annodex/Makefile.am b/ext/annodex/Makefile.am index 8c47683d..816e809b 100644 --- a/ext/annodex/Makefile.am +++ b/ext/annodex/Makefile.am @@ -1,11 +1,5 @@ -# plugindir is set in configure - -# change libgstplugin.la to something more suitable plugin_LTLIBRARIES = libgstannodex.la -# for the next set of variables, rename the prefix if you renamed the .la - -# sources used to compile this plug-in libgstannodex_la_SOURCES = \ gstannodex.c \ gstcmmlutils.c \ @@ -14,14 +8,11 @@ libgstannodex_la_SOURCES = \ gstcmmltag.c \ gstcmmlparser.c -# flags used to compile this plugin -# we use the GST_LIBS flags because we might be using plug-in libs libgstannodex_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) $(XML_CFLAGS) libgstannodex_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ $(GST_LIBS) $(XML_LIBS) libgstannodex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -# headers we need but don't want installed noinst_HEADERS = gstannodex.h gstcmmlutils.h gstcmmltag.h gstcmmlparser.h \ gstcmmldec.h gstcmmlenc.h diff --git a/ext/cdio/Makefile.am b/ext/cdio/Makefile.am index ba454d65..01092c71 100644 --- a/ext/cdio/Makefile.am +++ b/ext/cdio/Makefile.am @@ -1,4 +1,3 @@ - plugin_LTLIBRARIES = libgstcdio.la libgstcdio_la_SOURCES = \ @@ -7,12 +6,12 @@ libgstcdio_la_SOURCES = \ libgstcdio_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ - $(CDIO_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) + $(GST_CFLAGS) \ + $(CDIO_CFLAGS) libgstcdio_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstcdda-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstcdda-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) \ $(CDIO_LIBS) @@ -21,4 +20,3 @@ libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ gstcdio.h \ gstcdiocddasrc.h - diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am index 5afc7f06..d1f69ed3 100644 --- a/ext/dv/Makefile.am +++ b/ext/dv/Makefile.am @@ -1,18 +1,12 @@ plugin_LTLIBRARIES = libgstdv.la libgstdv_la_SOURCES = gstdv.c gstdvdec.c gstdvdemux.c -libgstdv_la_CFLAGS = $(GST_CFLAGS) $(LIBDV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstdv_la_LIBADD = $(GST_BASE_LIBS) $(LIBDV_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ +libgstdv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBDV_CFLAGS) +libgstdv_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) $(LIBDV_LIBS) libgstdv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstdvdemux.h gstdvdec.h -#if HAVE_GTK -#noinst_PROGRAMS = demo-play -#endif - -#demo_play_SOURCES = demo-play.c -#demo_play_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -#demo_play_LDFLAGS = $(GST_LIBS) $(GTK_LIBS) - EXTRA_DIST = NOTES diff --git a/ext/esd/Makefile.am b/ext/esd/Makefile.am index f47e2480..4c6aa4d9 100644 --- a/ext/esd/Makefile.am +++ b/ext/esd/Makefile.am @@ -1,9 +1,10 @@ plugin_LTLIBRARIES = libgstesd.la libgstesd_la_SOURCES = esdsink.c gstesd.c -#esdmon.c libgstesd_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ESD_CFLAGS) -libgstesd_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ $(ESD_LIBS) +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 d789ddcb..4f9dcf99 100644 --- a/ext/flac/Makefile.am +++ b/ext/flac/Makefile.am @@ -1,12 +1,10 @@ plugin_LTLIBRARIES = libgstflac.la -# gstflactag.c -# gstflactag.h - libgstflac_la_SOURCES = gstflac.c gstflacdec.c gstflacenc.c -libgstflac_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir) $(GST_PLUGINS_BASE_CFLAGS) -libgstflac_la_LIBADD = $(GST_LIBS) $(FLAC_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgsttag-@GST_MAJORMINOR@ +libgstflac_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstflac_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ + $(GST_LIBS) $(FLAC_LIBS) libgstflac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstflacenc.h gstflacdec.h diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am index 0f6a6c9a..316ca4e5 100644 --- a/ext/gdk_pixbuf/Makefile.am +++ b/ext/gdk_pixbuf/Makefile.am @@ -1,34 +1,14 @@ plugin_LTLIBRARIES = libgstgdkpixbuf.la libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c pixbufscale.c -libgstgdkpixbuf_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) -libgstgdkpixbuf_la_LIBADD = $(GTK_LIBS) $(GST_LIBS) $(GST_BASE_LIBS) +libgstgdkpixbuf_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) $(GTK_CFLAGS) +libgstgdkpixbuf_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - -#if -#loaderdir = $(DESTDIR)$(GDK_PIXBUF_LOADER_DIR) -#loader_LTLIBRARIES = gst_loader.la -# -#install-data-hook: -# if test -z "$(DESTDIR)" ; then \ -# $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_CONF_DIR) ; \ -# $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_CONF_DIR)/gdk-pixbuf.loaders ; \ -# fi -# -#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_LIBADD = $(GTK_LIBS) $(GST_LIBS) -#else -install-data-hook: - true -#endif - -noinst_HEADERS = gstgdkpixbuf.h \ +noinst_HEADERS = \ + gstgdkpixbuf.h \ pixbufscale.h \ gstgdkanimation.h - diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am index 9ec52c11..e9730715 100644 --- a/ext/ladspa/Makefile.am +++ b/ext/ladspa/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstladspa.la libgstladspa_la_SOURCES = gstsignalprocessor.c gstladspa.c search.c load.c libgstladspa_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstladspa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ +libgstladspa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstsignalprocessor.h gstladspa.h utils.h diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am index 0f3fdf38..4155803e 100644 --- a/ext/libcaca/Makefile.am +++ b/ext/libcaca/Makefile.am @@ -1,7 +1,10 @@ plugin_LTLIBRARIES = libgstcacasink.la libgstcacasink_la_SOURCES = gstcacasink.c -libgstcacasink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBCACA_CFLAGS) +libgstcacasink_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(LIBCACA_CFLAGS) libgstcacasink_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ diff --git a/ext/speex/Makefile.am b/ext/speex/Makefile.am index b643e111..f90ed016 100644 --- a/ext/speex/Makefile.am +++ b/ext/speex/Makefile.am @@ -1,9 +1,15 @@ plugin_LTLIBRARIES = libgstspeex.la libgstspeex_la_SOURCES = gstspeex.c gstspeexdec.c gstspeexenc.c -libgstspeex_la_CFLAGS = $(GST_CFLAGS) $(SPEEX_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstspeex_la_LIBADD = $(GST_LIBS) $(SPEEX_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgsttag-@GST_MAJORMINOR@ -libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) +libgstspeex_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(SPEEX_CFLAGS) +libgstspeex_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) \ + $(GST_LIBS) \ + $(SPEEX_LIBS) +libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstspeexenc.h gstspeexdec.h diff --git a/ext/taglib/Makefile.am b/ext/taglib/Makefile.am index 03774428..adeaae6f 100644 --- a/ext/taglib/Makefile.am +++ b/ext/taglib/Makefile.am @@ -2,16 +2,16 @@ plugin_LTLIBRARIES = libgsttaglib.la libgsttaglib_la_SOURCES = gsttaglibmux.c gstid3v2mux.cc gstapev2mux.cc libgsttaglib_la_CFLAGS = \ - $(GST_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ $(TAGLIB_CFLAGS) libgsttaglib_la_CXXFLAGS = \ - $(GST_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ $(TAGLIB_CFLAGS) libgsttaglib_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ $(GST_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ \ $(TAGLIB_LIBS) libgsttaglib_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am index 079444be..9677ac85 100644 --- a/sys/oss/Makefile.am +++ b/sys/oss/Makefile.am @@ -8,13 +8,11 @@ libgstossaudio_la_SOURCES = gstossaudio.c \ gstosssink.c \ gstosssrc.c -# gstossdmabuffer.c - libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstossaudio_la_LIBADD = \ - -lgstinterfaces-@GST_MAJORMINOR@ \ - -lgstaudio-@GST_MAJORMINOR@ \ $(GST_PLUGINS_BASE_LIBS) \ + -lgstinterfaces-$(GST_MAJORMINOR) \ + -lgstaudio-$(GST_MAJORMINOR) \ $(GST_LIBS) libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -26,10 +24,3 @@ noinst_HEADERS = common.h \ gstossmixer.h \ gstossmixerelement.h \ gstossmixertrack.h - -# noinst_PROGRAMS = #oss_probe - -# oss_probe_SOURCES = oss_probe.c -# oss_probe_CFLAGS = $(GST_CFLAGS) -# oss_probe_LDADD = $(GLIB_LIBS) - diff --git a/sys/sunaudio/Makefile.am b/sys/sunaudio/Makefile.am index 95e5f9e8..1f7e1214 100644 --- a/sys/sunaudio/Makefile.am +++ b/sys/sunaudio/Makefile.am @@ -8,9 +8,9 @@ libgstsunaudio_la_SOURCES = gstsunaudio.c \ libgstsunaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstsunaudio_la_LIBADD = \ - -lgstinterfaces-@GST_MAJORMINOR@ \ - -lgstaudio-@GST_MAJORMINOR@ \ $(GST_PLUGINS_BASE_LIBS) \ + -lgstinterfaces-$(GST_MAJORMINOR) \ + -lgstaudio-(GST_MAJORMINOR) \ $(GST_LIBS) libgstsunaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am index 1a25c775..74ea9d15 100644 --- a/sys/ximage/Makefile.am +++ b/sys/ximage/Makefile.am @@ -3,7 +3,8 @@ plugin_LTLIBRARIES = libgstximagesrc.la libgstximagesrc_la_SOURCES = gstximagesrc.c ximageutil.c libgstximagesrc_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) \ $(X_CFLAGS) $(XFIXES_CFLAGS) $(XDAMAGE_CFLAGS) libgstximagesrc_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ |