autogen.sh: Require automake 1.7

Original commit message from CVS:
* 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.

13 files changed, 56 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index b2a9fc1f..3015a00e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 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:
diff --git a/autogen.sh b/autogen.sh
index 75a6be03..956d8ddf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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/ext/alsaspdif/Makefile.am b/ext/alsaspdif/Makefile.am
index 77bd3c62..5087030d 100644
--- a/ext/alsaspdif/Makefile.am
+++ b/ext/alsaspdif/Makefile.am
@@ -6,8 +6,8 @@ libgstalsaspdif_la_SOURCES = alsaspdifsink.c
 # 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
diff --git a/ext/divx/Makefile.am b/ext/divx/Makefile.am
index 4630f248..0d9a979e 100644
--- a/ext/divx/Makefile.am
+++ b/ext/divx/Makefile.am
@@ -1,14 +1,13 @@
-
 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
diff --git a/ext/ivorbis/Makefile.am b/ext/ivorbis/Makefile.am
index 1098f72f..ccf3f298 100644
--- a/ext/ivorbis/Makefile.am
+++ b/ext/ivorbis/Makefile.am
@@ -1,4 +1,3 @@
-
 plugin_LTLIBRARIES = libgstivorbis.la
 
 libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c vorbisdec.c
diff --git a/ext/musicbrainz/Makefile.am b/ext/musicbrainz/Makefile.am
index 24259da9..e29cbb43 100644
--- a/ext/musicbrainz/Makefile.am
+++ b/ext/musicbrainz/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgsttrm.la
 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)
diff --git a/ext/neon/Makefile.am b/ext/neon/Makefile.am
index 1da120dd..b5ea9a77 100644
--- a/ext/neon/Makefile.am
+++ b/ext/neon/Makefile.am
@@ -1,15 +1,9 @@
-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
diff --git a/ext/sdl/Makefile.am b/ext/sdl/Makefile.am
index 24e6d985..556ad064 100644
--- a/ext/sdl/Makefile.am
+++ b/ext/sdl/Makefile.am
@@ -1,19 +1,18 @@
-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
diff --git a/ext/swfdec/Makefile.am b/ext/swfdec/Makefile.am
index 2d7f41d3..9cbfc83f 100644
--- a/ext/swfdec/Makefile.am
+++ b/ext/swfdec/Makefile.am
@@ -1,9 +1,8 @@
 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
-
diff --git a/ext/theora/Makefile.am b/ext/theora/Makefile.am
index b361d96f..8f003236 100644
--- a/ext/theora/Makefile.am
+++ b/ext/theora/Makefile.am
@@ -1,12 +1,14 @@
+### 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)
diff --git a/ext/wavpack/Makefile.am b/ext/wavpack/Makefile.am
index f91ae2b2..6de09e93 100644
--- a/ext/wavpack/Makefile.am
+++ b/ext/wavpack/Makefile.am
@@ -1,4 +1,3 @@
-
 plugin_LTLIBRARIES = libgstwavpack.la
 
 libgstwavpack_la_SOURCES = \
diff --git a/ext/xvid/Makefile.am b/ext/xvid/Makefile.am
index 411f330f..26a86cd9 100644
--- a/ext/xvid/Makefile.am
+++ b/ext/xvid/Makefile.am
@@ -1,9 +1,8 @@
-
 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
diff --git a/gst/modplug/Makefile.am b/gst/modplug/Makefile.am
index 8dc78a92..59d22863 100644
--- a/gst/modplug/Makefile.am
+++ b/gst/modplug/Makefile.am
@@ -4,8 +4,7 @@ plugin_LTLIBRARIES = libgstmodplug.la
 
 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