EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
-DISTCLEANFILES = stamp-api
-CLEANFILES = misc/modules_builtin.h
+DISTCLEANFILES = stamp-api libvlc.sym
+CLEANFILES = misc/modules_builtin.h misc/version.c
MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
../include/os_specific.h \
../include/snapshot.h \
../include/stream_output.h \
+ ../include/vlc_streaming.h \
../include/variables.h \
../include/video_output.h \
../include/vlc_access.h \
+ ../include/vlc_arrays.h \
../include/vlc_acl.h \
../include/vlc_bits.h \
../include/vlc_block.h \
../include/vlc_httpd.h \
../include/vlc_tls.h \
../include/vlc_md5.h \
+ ../include/vlc_devices.h \
../include/vlc_image.h \
../include/vlc_input.h \
../include/vlc_interaction.h \
../include/vlc_interface.h \
+ ../include/vlc_intf_strings.h \
../include/vlc_keys.h \
../include/vlc_messages.h \
../include/vlc_meta.h \
# 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 \
+ @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
+ sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2,g' | \
+ while read cmd; do echo $$cmd.a; eval "($$cmd.a)" || exit $$? ; done
endif
touch $@
###############################################################################
libvlc_a_SOURCES = $(SOURCES_libvlc)
-libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
-libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-
-libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
-libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic`
-libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
-libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
+libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic` -DUSE_BUILTINS
+libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
+libvlc_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
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc` \
+ -no-undefined -export-symbols libvlc.sym -version-info 0:0:0
+libvlc_la_DEPENDENCIES = stamp-builtins stamp-api
if HAVE_BEOS
lib_LTLIBRARIES = libvlc.la
else
lib_LIBRARIES = libvlc.a
-if BUILD_PIC
-lib_LIBRARIES += libvlc_pic.a
endif
+
+if HAVE_WIN32
+pic =
+else
+pic = pic
endif
if HAVE_WIN32
if BUILD_SHARED
-DATA_noinst_libvlc = libvlc$(LIBEXT)
+DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
endif
libvlc.dll.a: libvlc$(LIBEXT)
+ $(DLLTOOL) --export-all-symbols -l $@ -D $< $(libvlc_a_OBJECTS)
libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-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 \
c++) ld="$(CXXLINK)" ;; \
objc) ld="$(OBJCLINK)" ;; \
esac ; \
echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \
$$ld $(libvlc_a_OBJECTS) \
- -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a $$ldfl
+ $$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
+# Cygwin libtool work-around
@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
endif
SOURCES_libvlc_common = \
libvlc.c \
+ libvlc-common.c \
libvlc.h \
interface/interface.c \
interface/intf_eject.c \
interface/interaction.c \
- playlist/playlist.c \
+ playlist/playlist_internal.h \
+ 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 \
input/demux.c \
input/es_out.c \
input/input.c \
+ input/meta.c \
input/input_internal.h \
input/stream.c \
input/mem_stream.c \
audio_output/intf.c \
stream_output/stream_output.c \
stream_output/announce.c \
+ stream_output/profiles.c \
stream_output/sap.c \
osd/osd.c \
osd/osd_parser.c \
misc/unicode.c \
misc/cpu.c \
misc/configuration.c \
+ misc/configuration_chain.c \
misc/image.c \
misc/iso_lang.c \
misc/iso-639_def.h \
misc/update.c \
misc/vlm.c \
misc/xml.c \
- misc/hashtables.c \
+ misc/dict.c \
+ misc/devices.c \
extras/libc.c \
control/core.c \
control/playlist.c \
control/mediacontrol_audio_video.c \
$(NULL)
-# These should be distributed, but not compiled
-EXTRA_DIST += control/mediacontrol_init.c control/mediacontrol_plugin.c
-
SOURCES_libvlc = \
$(SOURCES_libvlc_common) \
$(OPT_SOURCES_libvlc_beos) \
$(OPT_SOURCES_libvlc_getopt) \
$(NULL)
-
if !USE_LIBTOOL
if !BUILD_SHARED
SOURCES_libvlc += misc/version.c
-CLEANFILES += misc/version.c
-
-misc/version.c:
- $(TOOLBOX) --update-version
endif
# Install shared libvlc
test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
endif
+misc/version.c: FORCE
+ $(TOOLBOX) --update-version
+
###############################################################################
# Stamp rules
###############################################################################
top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
touch stamp-api
+libvlc.sym:
+ rm -f stamp-api
+ $(MAKE) stamp-api
+
###############################################################################
# Unit/regression test
###############################################################################
if USE_LIBTOOL
-check_PROGRAMS = test_i18n_atof
+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
+FORCE:
projects / vlc / blobdiff