Simplify and fix (real) vlc dependencies and "make core" assuming libtool is used

diff --git a/Makefile.am b/Makefile.am
index 43c0b59d3ba557a5475c31e2a1822680aa893c07..36ee5817b3096da6ae84120add6102f523797e74 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,7 +246,7 @@ vlc_SOURCES = src/vlc.c
 # Ugly kludge so that automake defines $(CXXLINK)
 nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
 
-vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc)
+vlc_DEPENDENCIES = $(DATA_win32_rc)
 
 vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
 vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
@@ -268,13 +268,10 @@ nice:
 libvlc:
        cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
-core: libvlc
-       $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+core: libvlc vlc$(EXEEXT)
 
 .PHONY: libvlc core
 
-src/$(LIB_libvlc): libvlc
-
 vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
        @rm -f vlc$(EXEEXT)
        @case `$(VLC_CONFIG) --linkage vlc builtin` in \