]> git.sesse.net Git - vlc/blobdiff - src/Makefile.am
Merge branch 1.0-bugfix into master
[vlc] / src / Makefile.am
index 0285f8e88496b20d215c038ed7dd8172a68d1ed4..23daa48e7c73b6ca34f3ed7241e3ad6d8b276162 100644 (file)
@@ -71,6 +71,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_modules.h \
        ../include/vlc_mtime.h \
        ../include/vlc_objects.h \
+       ../include/vlc_picture.h \
        ../include/vlc_playlist.h \
        ../include/vlc_plugin.h \
        ../include/vlc_rand.h \
@@ -78,6 +79,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 \
@@ -236,22 +238,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 \