X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=84f380aec2b6a03278dc0e910182792c5e0fcd9e;hb=35e2425f9a49e674683479fde78fd7972b389a71;hp=7e3bd5730ce69f782ed0888ed7e0a3d15d9c44cd;hpb=ec6a7b8ec1fc9f070d1d5242836b1d643f9f2dd8;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e3bd5730c..84f380aec2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,9 +28,16 @@ pkginclude_HEADERS = \
 	../include/vlc/vlc.h \
 	../include/vlc/deprecated.h \
 	../include/vlc/libvlc.h \
-	../include/vlc/libvlc_structures.h \
-	../include/vlc/libvlc_media_list.h \
 	../include/vlc/libvlc_events.h \
+	../include/vlc/libvlc_media_list.h \
+	../include/vlc/libvlc_media.h \
+	../include/vlc/libvlc_media_discoverer.h \
+	../include/vlc/libvlc_media_library.h \
+	../include/vlc/libvlc_media_list.h \
+	../include/vlc/libvlc_media_list_player.h \
+	../include/vlc/libvlc_media_list_view.h \
+	../include/vlc/libvlc_media_player.h \
+	../include/vlc/libvlc_structures.h \
 	../include/vlc/libvlc_vlm.h \
 	../include/vlc/mediacontrol.h \
 	../include/vlc/mediacontrol_structures.h \
@@ -71,6 +78,9 @@ pluginsinclude_HEADERS = \
 	../include/vlc_modules.h \
 	../include/vlc_mtime.h \
 	../include/vlc_objects.h \
+	../include/vlc_picture.h \
+	../include/vlc_picture_fifo.h \
+	../include/vlc_picture_pool.h \
 	../include/vlc_playlist.h \
 	../include/vlc_plugin.h \
 	../include/vlc_rand.h \
@@ -78,6 +88,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_sout.h \
 	../include/vlc_stream.h \
 	../include/vlc_strings.h \
+	../include/vlc_subpicture.h \
 	../include/vlc_threads.h \
 	../include/vlc_url.h \
 	../include/vlc_variables.h \
@@ -160,7 +171,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 2:0:0
+	-version-info 3:0:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
 	$(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
@@ -236,22 +247,28 @@ endif
 endif
 
 SOURCES_libvlc_beos = \
+	misc/pthread.c \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
+	misc/pthread.c \
 	misc/darwin_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_linux = \
+	misc/pthread.c \
 	misc/linux_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_win32 = \
+	misc/w32thread.c \
 	misc/win32_specific.c \
 	network/winsock.c \
 	$(NULL)
 
-SOURCES_libvlc_other = misc/not_specific.c
+SOURCES_libvlc_other = \
+	misc/pthread.c \
+	misc/not_specific.c
 
 SOURCES_libvlc_dirent = \
 	extras/dirent.c \
@@ -422,6 +439,11 @@ SOURCES_libvlc = \
 
 SOURCES_libvlc_control = \
 	control/libvlc_internal.h \
+	control/event_internal.h \
+	control/media_internal.h \
+	control/media_list_internal.h \
+	control/media_list_view_internal.h \
+	control/media_player_internal.h \
 	control/core.c \
 	control/log.c \
 	control/playlist.c \
@@ -429,6 +451,7 @@ SOURCES_libvlc_control = \
 	control/video.c \
 	control/audio.c \
 	control/event.c \
+	control/event_async.c \
 	control/flat_media_list_view.c \
 	control/hierarchical_media_list_view.c \
 	control/hierarchical_node_media_list_view.c \