* ./Makefile.am: another workaround for an old automake 1.5 bug (bug #279).

diff --git a/Makefile.am b/Makefile.am
index 7f3391a1845bb58528d0b666c05fd76065c370a9..bd55aa4f16fdedbc579494692f2267a1e2d841c5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -352,10 +352,13 @@ vlc_SOURCES = src/vlc.c $(SOURCES_libgetopt)
 # but we don't write it directly, otherwise automake will go amok and eat all
 # the memory because of its 2^N crap algorithm. So we fool him. Nuahaha.
 vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) $(DATA_win32_rc) @AUTOMAKE_SUCKS@
-vlc_DEPENDENCIES = lib/libvlc.a $(L_builtin)
 vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default)
 
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
+# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
+# old automake-1.5 bug (automake/279).
+DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin)
+
+vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
        @rm -f vlc$(EXEEXT)
        $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
 if HAVE_BEOS

diff --git a/configure.ac.in b/configure.ac.in
index 28cfd9893723a9c9a62b04a8701b04fb3d8e861c..150c26a22bc8bc9aaffa1ced586d406ced07e2ab 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(,)
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 AM_CONFIG_HEADER(config.h)
 
 dnl