2007-04-29 Thomas Vander Stichele <thomas at apestaart dot org>
+ * autogen.sh:
+ Require automake 1.7
+ * ext/alsaspdif/Makefile.am:
+ * ext/divx/Makefile.am:
+ * ext/ivorbis/Makefile.am:
+ * ext/musicbrainz/Makefile.am:
+ * ext/neon/Makefile.am:
+ * ext/sdl/Makefile.am:
+ * ext/swfdec/Makefile.am:
+ * ext/theora/Makefile.am:
+ * ext/wavpack/Makefile.am:
+ * ext/xvid/Makefile.am:
+ * gst/modplug/Makefile.am:
+ Fix up Makefile.am accordingly.
+
+2007-04-29 Thomas Vander Stichele <thomas at apestaart dot org>
+
* docs/plugins/inspect/plugin-alsaspdif.xml:
* docs/plugins/inspect/plugin-bz2.xml:
* docs/plugins/inspect/plugin-cdxaparse.xml:
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" \
# flags used to compile this plugin
# we use the GST_LIBS flags because we might be using plug-in libs
libgstalsaspdif_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ALSA_CFLAGS)
-libgstalsaspdif_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(ALSA_LIBS)
-libgstalsaspdif_la_LDFLAGS = $(GST_BASE_LIBS) $(GST_PLUGIN_LDFLAGS)
+libgstalsaspdif_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS) $(ALSA_LIBS)
+libgstalsaspdif_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
# headers we need but don't want installed
noinst_HEADERS = alsaspdifsink.h
-
plugin_LTLIBRARIES = libgstdivxdec.la libgstdivxenc.la
+AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(DIVX_CFLAGS)
+
libgstdivxenc_la_SOURCES = gstdivxenc.c
-libgstdivxenc_la_CFLAGS = $(GST_CFLAGS) $(DIVX_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstdivxenc_la_LIBADD = $(DIVXENC_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstdivxenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(DIVXENC_LIBS)
libgstdivxenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstdivxdec_la_SOURCES = gstdivxdec.c
-libgstdivxdec_la_CFLAGS = $(GST_CFLAGS) $(DIVX_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstdivxdec_la_LIBADD = $(DIVXDEC_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstdivxdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(DIVXDEC_LIBS)
libgstdivxdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstdivxenc.h gstdivxdec.h
-
plugin_LTLIBRARIES = libgstivorbis.la
libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c vorbisdec.c
noinst_HEADERS = gsttrm.h
libgsttrm_la_SOURCES = gsttrm.c
-libgsttrm_la_CFLAGS = $(GST_CFLAGS) $(MUSICBRAINZ_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgsttrm_la_LIBADD = $(GST_LIBS) $(MUSICBRAINZ_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+libgsttrm_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(MUSICBRAINZ_CFLAGS)
+libgsttrm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(MUSICBRAINZ_LIBS) \
-lgsttag-@GST_MAJORMINOR@
libgsttrm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
+plugin_LTLIBRARIES = libgstneonhttpsrc.la
-plugin_LTLIBRARIES = libgstneonhttpsrc.la
+libgstneonhttpsrc_la_SOURCES = gstneonhttpsrc.c
-libgstneonhttpsrc_la_SOURCES = gstneonhttpsrc.c
-
-libgstneonhttpsrc_la_CFLAGS = $(GST_CFLAGS) \
- $(NEON_CFLAGS)
-
-libgstneonhttpsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-libgstneonhttpsrc_la_LIBADD = $(GST_BASE_LIBS) \
- $(NEON_LIBS)
+libgstneonhttpsrc_la_CFLAGS = $(GST_CFLAGS) $(NEON_CFLAGS)
+libgstneonhttpsrc_la_LIBADD = $(GST_BASE_LIBS) $(NEON_LIBS)
+libgstneonhttpsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstneonhttpsrc.h
-plugin_LTLIBRARIES = libgstsdlvideosink.la
+plugin_LTLIBRARIES = libgstsdl.la
-libgstsdlvideosink_la_SOURCES = gstsdl.c \
- sdlvideosink.c \
- sdlaudiosink.c
+libgstsdl_la_SOURCES = \
+ gstsdl.c \
+ sdlvideosink.c \
+ sdlaudiosink.c
-libgstsdlvideosink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
- $(SDL_CFLAGS)
-
-libgstsdlvideosink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+libgstsdl_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(SDL_CFLAGS)
+libgstsdl_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_MAJORMINOR) \
- -lgstaudio-@GST_MAJORMINOR@ \
+ -lgstaudio-$(GST_MAJORMINOR) \
-lgstinterfaces-$(GST_MAJORMINOR) \
$(SDL_LIBS)
+libgstsdl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = sdlvideosink.h \
- sdlaudiosink.h
+noinst_HEADERS = \
+ sdlvideosink.h \
+ sdlaudiosink.h
plugin_LTLIBRARIES = libgstswfdec.la
libgstswfdec_la_SOURCES = gstswfdec.c
-libgstswfdec_la_CFLAGS = $(GST_CFLAGS) $(SWFDEC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstswfdec_la_LIBADD = $(SWFDEC_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)
+libgstswfdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(SWFDEC_CFLAGS)
+libgstswfdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BLIBS) $(SWFDEC_LIBS)
libgstswfdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstswfdec.h
-
+### FIXME: rename directory to theoraexp
+
plugin_LTLIBRARIES = libgsttheoraexp.la
noinst_HEADERS = theoradec.h
libgsttheoraexp_la_SOURCES = theoradec.c
-libgsttheoraexp_la_CFLAGS = $(GST_CFLAGS) $(THEORADEC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgsttheoraexp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgsttheoraexp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(THEORADEC_CFLAGS)
libgsttheoraexp_la_LIBADD = \
- -lgsttag-@GST_MAJORMINOR@ \
+ $(GST_PLUGINS_BASE_LIBS) \
+ -lgsttag-$(GST_MAJORMINOR) \
$(GST_LIBS) \
- $(THEORADEC_LIBS) \
- $(GST_PLUGINS_BASE_LIBS)
+ $(THEORADEC_LIBS)
+libgsttheoraexp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
plugin_LTLIBRARIES = libgstwavpack.la
libgstwavpack_la_SOURCES = \
-
plugin_LTLIBRARIES = libgstxvid.la
libgstxvid_la_SOURCES = gstxvidenc.c gstxviddec.c gstxvid.c
-libgstxvid_la_CFLAGS = $(GST_CFLAGS) $(XVID_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstxvid_la_LIBADD = $(XVID_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstxvid_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(XVID_CFLAGS)
+libgstxvid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(XVID_LIBS)
libgstxvid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstxvidenc.h gstxviddec.h gstxvid.h
libgstmodplug_la_SOURCES = gstmodplug.cc
libgstmodplug_la_CXXFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la
-libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_BASE_LIBS) \
- -lstdc++
+libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la $(GST_PLUGINS_BASE_LIBS) -lstdc++
+libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstmodplug.h