Remove vlc_threads_(init|end), fix thread-safety on Win32

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e2b5e06c404675360ea7eea78f082c9c5975d791..afe3101dda239aced73e1cd0991f5b8e5ee27474 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,7 +179,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
        -DPLUGIN_PATH=\"$(pkglibdir)\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
        -export-symbols $(srcdir)/libvlccore.sym \
-       -version-info 0:2:0
+       -version-info 1:0:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
@@ -306,6 +306,8 @@ SOURCES_libvlc_common = \
        input/es_out.c \
        input/input.c \
        input/meta.c \
+       input/input_clock.h \
+       input/input_decoder.h \
        input/input_internal.h \
        input/vlm_internal.h \
        input/stream.c \
@@ -319,6 +321,7 @@ SOURCES_libvlc_common = \
        video_output/video_widgets.c \
        video_output/vout_subpictures.c \
        video_output/vout_intf.c \
+       video_output/vout_internal.h \
        audio_output/aout_internal.h \
        audio_output/common.c \
        audio_output/dec.c \
@@ -433,12 +436,11 @@ SOURCES_libvlc_control = \
 ###############################################################################
 
 misc/revision.c:
-       rm -f $@ $@.tmp
+       rm -f -- $@ $@.tmp
        echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-       REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref --head -s HEAD 2>/dev/null || echo exported)"; \
-       REVISION="$$(echo $$REVISION|cut -b -10)"; \
+       REVISION="$$(cd "$(top_srcdir)"; git describe 2>/dev/null || echo exported)"; \
        echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
-       mv -f $@.tmp $@
+       mv -f -- $@.tmp $@
 
 
 ###############################################################################