Commit 5c05d056 authored by Sam Hocevar's avatar Sam Hocevar

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

parent 106497cd
...@@ -352,10 +352,13 @@ vlc_SOURCES = src/vlc.c $(SOURCES_libgetopt) ...@@ -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 # 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. # 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_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_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) @rm -f vlc$(EXEEXT)
$(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS) $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
if HAVE_BEOS if HAVE_BEOS
......
...@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM ...@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support 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. 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) AM_CONFIG_HEADER(config.h)
dnl dnl
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment