JPEG 2000 decoding support.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index bd81fe4096e26c1df7439f05c9bed971eae67c61..638c7e4ed1f61943eac5a7693f05ce5f366652b1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,6 +107,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_vout_osd.h \
        ../include/vlc_vout_window.h \
        ../include/vlc_xml.h \
+       ../include/vlc_xlib.h \
        $(NULL)
 
 noinst_HEADERS = \
@@ -126,6 +127,7 @@ noinst_HEADERS = \
        ../include/vlc_update.h \
        ../include/vlc_vod.h \
        ../include/vlc_vout_wrapper.h \
+       ../include/vlc_windows_interfaces.h \
        $(NULL)
 
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
@@ -213,7 +215,7 @@ libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \
        libvlccore.la ../compat/libcompat.la
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
-       -version-info 5:0:0 \
+       -version-info 6:0:1 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
@@ -375,7 +377,6 @@ SOURCES_libvlc_common = \
        video_output/postprocessing.h \
        video_output/video_output.c \
        video_output/vout_pictures.c \
-       video_output/vout_pictures.h \
        video_output/video_text.c \
        video_output/video_epg.c \
        video_output/video_widgets.c \
@@ -395,7 +396,6 @@ SOURCES_libvlc_common = \
        audio_output/intf.c \
        osd/osd.c \
        osd/osd_text.c \
-       osd/osd_widgets.c \
        network/acl.c \
        network/getaddrinfo.c \
        network/io.c \
@@ -430,6 +430,7 @@ SOURCES_libvlc_common = \
        misc/cpu.c \
        misc/action.c \
        misc/epg.c \
+       misc/exit.c \
        config/configuration.h \
        config/core.c \
        config/chain.c \
@@ -457,6 +458,9 @@ SOURCES_libvlc_common = \
        misc/filter_chain.c \
        misc/http_auth.c \
        misc/sql.c \
+       misc/text_style.c \
+       misc/subpicture.c \
+       misc/subpicture.h \
        $(NULL)
 
 SOURCES_libvlc_httpd = \