# Automake targets and declarations
###############################################################################
+AUTOMAKE_OPTIONS = subdir-objects
+
NULL =
SUBDIRS =
BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
DISTCLEANFILES = stamp-api
-CLEANFILES = misc/modules_builtin.h misc/version.c
-MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
+CLEANFILES = misc/modules_builtin.h
+MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
../include/vlc_playlist.h \
../include/vlc_spu.h \
../include/vlc_stream.h \
+ ../include/vlc_strings.h \
../include/vlc_symbols.h \
../include/vlc_threads_funcs.h \
../include/vlc_threads.h \
../include/vlc_update.h \
+ ../include/vlc_url.h \
../include/vlc_video.h \
../include/vlc_vlm.h \
../include/vlc_vod.h \
misc/modules.c: misc/modules_builtin.h
-misc/version.c: FORCE
- $(TOOLBOX) --update-version
-
-# These dependencies are mandatory
-$(SOURCES_libvlc): $(LIB_intl)
-
###############################################################################
-# Optional libintl - FIXME, bad dependencies
+# Building builtin modules
###############################################################################
-
-../intl/libintl.a: FORCE
- cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS)
-
-if BUILD_INTL
-LIB_intl = ../intl/libintl.a
+#
+# As long as we use builtins with a shared libvlc, we must build them before
+# we build libvlc. Maybe one day, libvlc will handle multiple modules per
+# shared object, which will make builtins fairly redumdant. Until then, we
+# need this workaround.
+
+stamp-builtins: Makefile ../vlc-config ../config.status
+if USE_LIBTOOL
+ @for c in `$(VLC_CONFIG) --libs builtin`; do \
+ case $$c in \
+ ../modules/*.a) echo $$c ;; \
+ esac ; \
+ done | \
+ sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2_builtin.la/g' | \
+ while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done
+endif
+if BUILD_SHARED
+ @if test "$(pic)" = "pic"; then ext="_pic.a"; else ext=".a"; fi ; \
+ for c in `$(VLC_CONFIG) --libs builtin`; do \
+ case $$c in \
+ ../modules/*.a) echo $$c ;; \
+ esac ; \
+ done | \
+ sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \
+ while read cmd; do echo $$cmd$$ext; eval "($$cmd$$ext)" || exit $$? ; done
endif
+ touch $@
###############################################################################
# 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_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
+libvlc_la_SOURCES = $(SOURCES_libvlc)
+libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
+libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \
+ -avoid-version -no-undefined
+libvlc_la_DEPENDENCIES = stamp-builtins
+
+
if HAVE_BEOS
OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
endif
endif
# Build libvlc as a shared library
-if BUILD_SHARED
-DATA_noinst_libvlc = libvlc$(LIBEXT)
-if HAVE_WIN32
-OBJECTS_libvlc_so = $(libvlc_a_OBJECTS)
+if USE_LIBTOOL
+lib_LTLIBRARIES = libvlc.la
else
-OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS)
+lib_LIBRARIES = libvlc.a
+if BUILD_PIC
+lib_LIBRARIES += libvlc_pic.a
+endif
endif
+
+if HAVE_WIN32
+if BUILD_SHARED
+DATA_noinst_libvlc = libvlc$(LIBEXT)
endif
-libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
- @ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic)`" ; \
- case `$(VLC_CONFIG) --linkage vlc` in \
+libvlc.dll.a: libvlc$(LIBEXT)
+
+libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
+ @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \
+ case `$(VLC_CONFIG) --linkage vlc builtin` in \
c++) ld="$(CXXLINK)" ;; \
objc) ld="$(OBJCLINK)" ;; \
c|*) ld="$(LINK)" ;; \
esac ; \
- echo $$ld $(OBJECTS_libvlc_so) $$ldfl ; \
- $$ld $(OBJECTS_libvlc_so) $$ldfl
+ echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \
+ $$ld $(libvlc_a_OBJECTS) \
+ -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a $$ldfl
+# It sucks big time, but we have to do that to link vlc properly
+# on non-PIC OSes, otherwise ld will favor builtins-less libvlc.a over
+# libvlc$(LIBEXT)
+ rm -f libvlc.a
+# Cygwin work-around
+ @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
+endif
EXTRA_DIST += \
$(SOURCES_libvlc_beos) \
interface/interface.c \
interface/intf_eject.c \
interface/interaction.c \
- playlist/playlist.c \
+ playlist/thread.c \
+ playlist/control.c \
+ playlist/engine.c \
playlist/sort.c \
playlist/loadsave.c \
- playlist/view.c \
+ playlist/tree.c \
playlist/item.c \
- playlist/item-ext.c \
+ playlist/search.c \
playlist/services_discovery.c \
+ input/item.c \
input/access.c \
input/clock.c \
input/control.c \
audio_output/common.c \
audio_output/dec.c \
audio_output/filters.c \
- audio_output/ainput.c \
+ audio_output/input.c \
audio_output/mixer.c \
audio_output/output.c \
audio_output/intf.c \
network/acl.c \
network/getaddrinfo.c \
network/io.c \
+ network/error.c \
network/tcp.c \
network/udp.c \
network/httpd.c \
misc/modules.c \
misc/threads.c \
misc/stats.c \
+ misc/strings.c \
misc/unicode.c \
misc/cpu.c \
misc/configuration.c \
misc/vlm.c \
misc/xml.c \
misc/hashtables.c \
- misc/version.c \
extras/libc.c \
control/core.c \
- control/control_playlist.c \
- control/control_vlm.c \
- control/control_input.c \
+ control/playlist.c \
+ control/vlm.c \
+ control/input.c \
control/video.c \
+ control/audio.c \
control/mediacontrol_core.c \
control/mediacontrol_util.c \
control/mediacontrol_audio_video.c \
$(OPT_SOURCES_libvlc_getopt) \
$(NULL)
-# Install the symlinks and shared libvlc
+
+if !USE_LIBTOOL
+if !BUILD_SHARED
+SOURCES_libvlc += misc/version.c
+CLEANFILES += misc/version.c
+
+misc/version.c: FORCE
+ $(TOOLBOX) --update-version
+FORCE:
+
+endif
+
+# Install shared libvlc
install-exec-local:
test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
# the opposite of install-{data,exec}-local
uninstall-local:
test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
+endif
###############################################################################
# Stamp rules
touch stamp-api
###############################################################################
-# Force rule
+# Unit/regression test
###############################################################################
-FORCE:
+if USE_LIBTOOL
+check_PROGRAMS = test_i18n_atof test_url
+TESTS = $(check_PROGRAMS)
+
+CFLAGS_tests = `$(VLC_CONFIG) --cflags vlc`
+
+test_i18n_atof_SOURCES = test/i18n_atof.c
+test_i18n_atof_LDADD = libvlc.la
+test_i18n_atof_CFLAGS = $(CFLAGS_tests)
+
+test_url_SOURCES = test/url.c
+test_url_LDADD = libvlc.la
+test_url_CFLAGS = $(CFLAGS_tests)
+endif
+
projects / vlc / blobdiff