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

Don't build old-style when libtool is enabled

parent 517a49ff
...@@ -126,8 +126,6 @@ if USE_LIBTOOL ...@@ -126,8 +126,6 @@ if USE_LIBTOOL
../modules/*.a) echo $$c ;; \ ../modules/*.a) echo $$c ;; \
esac ; \ esac ; \
done | \ done | \
sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \
while read cmd; do echo $$cmd$$ext; eval "($$cmd$$ext)" || exit $$? ; done
sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2.la/g' | \ sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2.la/g' | \
while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done
endif endif
...@@ -147,21 +145,6 @@ endif ...@@ -147,21 +145,6 @@ endif
# Building libvlc # Building libvlc
############################################################################### ###############################################################################
LIBRARIES_nopic = libvlc.a
LIBRARIES_pic = libvlc_pic.a
if HAVE_WIN32
lib_LIBRARIES = $(LIBRARIES_nopic)
else
if BUILD_SHARED
lib_LIBRARIES = $(LIBRARIES_pic)
else
lib_LIBRARIES = $(LIBRARIES_nopic)
if BUILD_PIC
lib_LIBRARIES += $(LIBRARIES_pic)
endif
endif
endif
libvlc_a_SOURCES = $(SOURCES_libvlc) libvlc_a_SOURCES = $(SOURCES_libvlc)
libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc` libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc` libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
...@@ -203,7 +186,23 @@ endif ...@@ -203,7 +186,23 @@ endif
# Build libvlc as a shared library # Build libvlc as a shared library
if USE_LIBTOOL if USE_LIBTOOL
lib_LTLIBRARIES = libvlc.la lib_LTLIBRARIES = libvlc.la
else
LIBRARIES_nopic = libvlc.a
LIBRARIES_pic = libvlc_pic.a
if HAVE_WIN32
lib_LIBRARIES = $(LIBRARIES_nopic)
else
if BUILD_SHARED
lib_LIBRARIES = $(LIBRARIES_pic)
else
lib_LIBRARIES = $(LIBRARIES_nopic)
if BUILD_PIC
lib_LIBRARIES += $(LIBRARIES_pic)
endif endif
endif
endif
endif
if BUILD_SHARED if BUILD_SHARED
DATA_noinst_libvlc = libvlc$(LIBEXT) DATA_noinst_libvlc = libvlc$(LIBEXT)
if HAVE_WIN32 if HAVE_WIN32
......
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