update build files

Original commit message from CVS:
* autogen.sh:
* configure.ac:
* ext/a52dec/Makefile.am:
* ext/dvdnav/Makefile.am:
* ext/dvdread/Makefile.am:
* ext/lame/Makefile.am:
* ext/mad/Makefile.am:
* ext/mpeg2dec/Makefile.am:
* ext/sidplay/Makefile.am:
update build files
This commit is contained in:
Thomas Vander Stichele 2006-06-11 17:08:11 +00:00
parent dfe571ee9e
commit 0d7bca79b6
10 changed files with 44 additions and 57 deletions

View file

@ -1,3 +1,16 @@
2006-06-11 Thomas Vander Stichele <thomas at apestaart dot org>
* autogen.sh:
* configure.ac:
* ext/a52dec/Makefile.am:
* ext/dvdnav/Makefile.am:
* ext/dvdread/Makefile.am:
* ext/lame/Makefile.am:
* ext/mad/Makefile.am:
* ext/mpeg2dec/Makefile.am:
* ext/sidplay/Makefile.am:
update build files
2006-06-07 Wim Taymans <wim@fluendo.com>
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_finalize),

View file

@ -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.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" \

View file

@ -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/prerelease
AC_INIT(GStreamer Ugly Plug-ins, 0.10.3.1,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-plugins-ugly)
@ -219,7 +221,7 @@ GST_CHECK_FEATURE(A52DEC, [a52dec], a52dec, [
dnl *** AMR-NB ***
translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true)
GST_CHECK_FEATURE(AMRNB, [AMR-NB], amrnbdec amrnbenc, [
GST_CHECK_FEATURE(AMRNB, [AMR-NB], amrnb, [
GST_CHECK_LIBHEADER(AMRNB, amrnb,
Decoder_Interface_init, -lm,
amrnb/interf_dec.h,
@ -236,7 +238,7 @@ GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdreadsrc, [
dnl *** dvdnav ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DVDNAV, true)
GST_CHECK_FEATURE(DVDNAV, [dvdnav library], dvdnavsrc, [
GST_CHECK_FEATURE(DVDNAV, [dvdnav library], dvdnav, [
translit(dnm, m, l) AC_SUBST(DVDNAV_LIBS)
translit(dnm, m, l) AC_SUBST(DVDNAV_CFLAGS)
GST_CHECK_CONFIGPROG(DVDNAV, dvdnav-config)
@ -300,7 +302,7 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_ID3TAG, true)
GST_CHECK_FEATURE(ID3TAG, [id3tag reading and writing from the MAD project],
id3tag, [
dnl check with pkg-config first
PKG_CHECK_MODULES(ID3TAG, id3tag >= 0.15, HAVE_ID3TAG="yes", HAVE_ID3TAG="no")
GST_PKG_CHECK_MODULES(ID3TAG, id3tag >= 0.15)
if test "x$HAVE_ID3TAG" = "xno"; then
dnl fall back to oldskool detection
AC_CHECK_HEADER(id3tag.h, [
@ -309,18 +311,17 @@ GST_CHECK_FEATURE(ID3TAG, [id3tag reading and writing from the MAD project],
AC_CHECK_LIB(id3tag, id3_tag_options,
HAVE_ID3TAG="yes" ID3TAG_LIBS="-lid3tag -lz")
LIBS=$save_LIBS
AC_SUBST(ID3TAG_LIBS)
])
fi
])
AC_SUBST(ID3TAG_LIBS)
dnl *** mad ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
if test "x$HAVE_ID3TAG" = "xyes"; then
dnl check with pkg-config first
PKG_CHECK_MODULES(MAD, mad >= 0.15 id3tag >= 0.15,
HAVE_MAD="yes", HAVE_MAD="no")
GST_PKG_CHECK_MODULES(MAD, mad >= 0.15 id3tag >= 0.15)
if test "x$HAVE_MAD" = "xno"; then
dnl fall back to oldskool detection
AC_CHECK_HEADER(mad.h, [
@ -338,15 +339,12 @@ AC_SUBST(MAD_LIBS)
dnl *** mpeg2dec ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MPEG2DEC, true)
GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [
PKG_CHECK_MODULES(MPEG2DEC, libmpeg2 >= 0.4.0,
HAVE_MPEG2DEC="yes", HAVE_MPEG2DEC="no")
AC_SUBST(MPEG2DEC_CFLAGS)
AC_SUBST(MPEG2DEC_LIBS)
GST_PKG_CHECK_MODULES(MPEG2DEC, libmpeg2 >= 0.4.0)
])
dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true)
GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [
GST_CHECK_FEATURE(SIDPLAY, [libsidplay], sid, [
GST_PATH_SIDPLAY()
])

View file

@ -1,16 +1,16 @@
plugin_LTLIBRARIES = libgsta52dec.la
libgsta52dec_la_SOURCES = gsta52dec.c
libgsta52dec_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(LIBOIL_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS)
$(A52DEC_CFLAGS)
libgsta52dec_la_LIBADD = \
$(A52DEC_LIBS) \
$(LIBOIL_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-@GST_MAJORMINOR@
-lgstaudio-$(GST_MAJORMINOR)
$(LIBOIL_LIBS) \
$(A52DEC_LIBS)
libgsta52dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gsta52dec.h

View file

@ -1,16 +1,9 @@
plugin_LTLIBRARIES = libgstdvdnav.la
libgstdvdnav_la_SOURCES = dvdnavsrc.c
libgstdvdnav_la_CFLAGS = \
$(GST_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(DVDNAV_CFLAGS)
libgstdvdnav_la_LIBADD = \
$(GST_BASE_LIBS) \
$(DVDNAV_LIBS)
libgstdvdnav_la_LDFLAGS = \
$(GST_PLUGIN_LDFLAGS)
libgstdvdnav_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(DVDNAV_CFLAGS)
libgstdvdnav_la_LIBADD = $(GST_BASE_LIBS) $(DVDNAV_LIBS)
libgstdvdnav_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = dvdnavsrc.h

View file

@ -1,16 +1,9 @@
plugin_LTLIBRARIES = libgstdvdread.la
libgstdvdread_la_SOURCES = dvdreadsrc.c
libgstdvdread_la_CFLAGS = \
$(GST_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(DVDREAD_CFLAGS)
libgstdvdread_la_LIBADD = \
$(GST_BASE_LIBS) \
$(DVDREAD_LIBS)
libgstdvdread_la_LDFLAGS = \
$(GST_PLUGIN_LDFLAGS)
libgstdvdread_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(DVDREAD_CFLAGS)
libgstdvdread_la_LIBADD = $(GST_BASE_LIBS) $(DVDREAD_LIBS)
libgstdvdread_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = dvdreadsrc.h

View file

@ -1,4 +1,3 @@
plugin_LTLIBRARIES = libgstlame.la
libgstlame_la_SOURCES = gstlame.c
@ -7,15 +6,3 @@ libgstlame_la_LIBADD = $(LAME_LIBS)
libgstlame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstlame.h
AM_CFLAGS = $(GST_CFLAGS)
LIBS = $(GST_LIBS) $(LAME_LIBS)
## testprogs = test-lame
## TESTS = $(testprogs)
## check_PROGRAMS = $(testprogs)
## $(TESTS):
## @echo -e '\nrunning gst-register for tests...\n'
## $(GST_TOOLS_DIR)/gst-register --gst-mask=0 --gst-plugin-path=$(GST_PLUGIN_PATH)

View file

@ -2,8 +2,12 @@ plugin_LTLIBRARIES = libgstmad.la
libgstmad_la_SOURCES = gstmad.c gstid3tag.c
libgstmad_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(MAD_CFLAGS) $(ID3_CFLAGS)
libgstmad_la_LIBADD = $(MAD_LIBS) $(ID3_LIBS)
libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@
libgstmad_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
$(MAD_CFLAGS) $(ID3_CFLAGS)
libgstmad_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
$(MAD_LIBS) $(ID3_LIBS)
libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstmad.h

View file

@ -1,4 +1,3 @@
plugin_LTLIBRARIES = libgstmpeg2dec.la
libgstmpeg2dec_la_SOURCES = gstmpeg2dec.c

View file

@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstsid.la
libgstsid_la_SOURCES = gstsiddec.cc
libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(SIDPLAY_CFLAGS)
libgstsid_la_LIBADD = $(SIDPLAY_LIBS) $(GST_PLUGINS_BASE_LIBS)
libgstsid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(SIDPLAY_LIBS)
libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstsiddec.h