Skip to content

V
vlc-1.1
Commit 7b4638dd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

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

parent 7b6ad1ab
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
Makefile.am
View file @ 7b4638dd
...@@ -246,7 +246,7 @@ vlc_SOURCES = src/vlc.c ...@@ -246,7 +246,7 @@ vlc_SOURCES = src/vlc.c
# Ugly kludge so that automake defines $(CXXLINK) # Ugly kludge so that automake defines $(CXXLINK)
nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m 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_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
...@@ -268,13 +268,10 @@ nice: ...@@ -268,13 +268,10 @@ nice:
libvlc: libvlc:
cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc) cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
core: libvlc core: libvlc vlc$(EXEEXT)
$(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
.PHONY: libvlc core .PHONY: libvlc core
src/$(LIB_libvlc): libvlc
vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
@rm -f vlc$(EXEEXT) @rm -f vlc$(EXEEXT)
@case `$(VLC_CONFIG) --linkage vlc builtin` in \ @case `$(VLC_CONFIG) --linkage vlc builtin` in \
......
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