From bc387d3ddbcc909b6e874b9dcda690ba0a40cfde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 19 May 2007 20:00:54 +0000 Subject: [PATCH] Remove unneeded old kludge --- Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index d71b83a34a19..70aa1eaf5e1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -268,9 +268,7 @@ if HAVE_WINCE vlc_WORKAROUNDLDFLAGS = $(LIBVLC) endif -# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an -# old automake-1.5 bug (automake/279). -DEPENDENCIES_vlc = src/$(LIB_libvlc) $(DATA_win32_rc) +vlc_DEPENDENCIES = src/$(LIB_libvlc) $(DATA_win32_rc) vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) @@ -288,7 +286,7 @@ else vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin` LIB_libvlc = libvlc.a LIBVLC = src/$(LIB_libvlc) -DEPENDENCIES_vlc += stamp-builtin +vlc_DEPENDENCIES += stamp-builtin endif vlc_LDADD += $(INCLUDED_LIBINTL) endif @@ -306,7 +304,7 @@ core: libvlc src/$(LIB_libvlc): libvlc -vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) +vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_DEPENDENCIES) @rm -f vlc$(EXEEXT) @case `$(VLC_CONFIG) --linkage vlc builtin` in \ c++) cmd="$(CXXLINK)" ;; \