Commit 008e13fc authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Don't rebuild static libvlc when not needed

Yet to find a solution for the same problem with shared libvlc
parent 03cd8e02
...@@ -119,8 +119,10 @@ misc/version.c: FORCE ...@@ -119,8 +119,10 @@ misc/version.c: FORCE
# shared object, which will make builtins fairly redumdant. Until then, we # shared object, which will make builtins fairly redumdant. Until then, we
# need this workaround. # need this workaround.
builtins:
if BUILD_SHARED if BUILD_SHARED
do_builtins = builtins
builtins:
@if test "$(pic)" = "pic"; then ext="_pic.a"; else ext=".a"; fi ; \ @if test "$(pic)" = "pic"; then ext="_pic.a"; else ext=".a"; fi ; \
for c in `$(VLC_CONFIG) --libs builtin`; do \ for c in `$(VLC_CONFIG) --libs builtin`; do \
case $$c in \ case $$c in \
...@@ -129,9 +131,9 @@ if BUILD_SHARED ...@@ -129,9 +131,9 @@ if BUILD_SHARED
done | \ done | \
sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \ sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \
while read cmd; do echo $$cmd$$ext; eval "($$cmd$$ext)" || exit $$? ; done while read cmd; do echo $$cmd$$ext; eval "($$cmd$$ext)" || exit $$? ; done
endif
.PHONY: builtins .PHONY: builtins
endif
############################################################################### ###############################################################################
# Building libvlc # Building libvlc
...@@ -191,7 +193,7 @@ OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS) ...@@ -191,7 +193,7 @@ OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS)
endif endif
endif endif
libvlc$(LIBEXT): $(OBJECTS_libvlc_so) builtins libvlc$(LIBEXT): $(OBJECTS_libvlc_so) $(do_builtins)
@ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \ @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \
case `$(VLC_CONFIG) --linkage vlc builtin` in \ case `$(VLC_CONFIG) --linkage vlc builtin` in \
c++) ld="$(CXXLINK)" ;; \ c++) ld="$(CXXLINK)" ;; \
......
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