From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sun, 30 Sep 2007 19:28:30 +0000 (+0000)
Subject: Simplify and fix (real) vlc dependencies and "make core" assuming libtool is used
X-Git-Tag: 0.9.0-test0~5304
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7b4638dd18df095dbdb7e37a628f3f27cd10f587;p=vlc

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

diff --git a/Makefile.am b/Makefile.am
index 43c0b59d3b..36ee5817b3 100644
--- 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 \