LibVLC: per-thread error message API

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b0265991cef3f1995f239d2ad6de407a9f7bbc73..bbbe84852cfbee62ceb19a173f5372d6412cc056 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -95,7 +95,8 @@ pluginsinclude_HEADERS = \
        ../include/vlc_vlm.h \
        ../include/vlc_video_splitter.h \
        ../include/vlc_vout.h \
-       ../include/vlc_window.h \
+       ../include/vlc_vout_display.h \
+       ../include/vlc_vout_window.h \
        ../include/vlc_xml.h \
        $(NULL)
 
@@ -176,7 +177,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
-       -version-info 3:0:0
+       -version-info 4:0:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
        $(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
@@ -344,12 +345,18 @@ SOURCES_libvlc_common = \
        input/stream_memory.c \
        input/subtitles.c \
        input/var.c \
+       video_output/display.c \
+       video_output/display.h \
+       video_output/snapshot.c \
+       video_output/snapshot.h \
+       video_output/statistic.h \
        video_output/video_output.c \
        video_output/vout_pictures.c \
        video_output/vout_pictures.h \
        video_output/video_text.c \
        video_output/video_widgets.c \
        video_output/vout_subpictures.c \
+       video_output/window.c \
        video_output/vout_intf.c \
        video_output/vout_internal.h \
        video_output/vout_control.h \
@@ -453,6 +460,7 @@ SOURCES_libvlc_control = \
        control/media_list_view_internal.h \
        control/media_player_internal.h \
        control/core.c \
+       control/error.c \
        control/log.c \
        control/playlist.c \
        control/vlm.c \