Fixed OSD widget rendering code to render at display size.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 68aaf26c2edf070483e01743aef50fc8a05d1a92..1fa5b860b6a5da29830e8fab7042c8ad0667f44d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,13 +7,15 @@ SUBDIRS = . test
 
 NULL =
 EXTRA_DIST = extras/COPYING \
-       misc/beos_specific.cpp \
        libvlc.pc.in \
        vlc-plugin.pc.in \
        libvlc.sym \
-       libvlccore.sym
+       libvlccore.sym \
+       ../include/vlc/libvlc_version.h.in
 
-BUILT_SOURCES = ../include/vlc_about.h
+BUILT_SOURCES = \
+       $(nodist_pkginclude_HEADERS) \
+       $(nodist_pluginsinclude_HEADERS)
 CLEANFILES = $(BUILT_SOURCES)
 
 SUFFIXES = .pc.in .pc .rc.in .rc
@@ -38,6 +40,7 @@ pkginclude_HEADERS = \
        ../include/vlc/libvlc_structures.h \
        ../include/vlc/libvlc_vlm.h \
        $(NULL)
+nodist_pkginclude_HEADERS = ../include/vlc/libvlc_version.h
 
 pluginsinclude_HEADERS = \
        ../include/vlc_access.h \
@@ -46,6 +49,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_aout_mixer.h \
        ../include/vlc_arrays.h \
        ../include/vlc_art_finder.h \
+       ../include/vlc_atomic.h \
        ../include/vlc_avcodec.h \
        ../include/vlc_bits.h \
        ../include/vlc_block.h \
@@ -77,6 +81,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_md5.h \
        ../include/vlc_messages.h \
        ../include/vlc_meta.h \
+       ../include/vlc_media_library.h \
        ../include/vlc_modules.h \
        ../include/vlc_mouse.h \
        ../include/vlc_mtime.h \
@@ -109,6 +114,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_xml.h \
        ../include/vlc_xlib.h \
        $(NULL)
+nodist_pluginsinclude_HEADERS = ../include/vlc_about.h
 
 noinst_HEADERS = \
        ../include/vlc_codec_synchro.h \
@@ -127,8 +133,13 @@ noinst_HEADERS = \
        ../include/vlc_update.h \
        ../include/vlc_vod.h \
        ../include/vlc_vout_wrapper.h \
+       ../include/vlc_windows_interfaces.h \
        $(NULL)
 
+../include/vlc/libvlc_version.h: ../include/vlc/libvlc_version.h.in $(top_builddir)/config.status
+       $(AM_V_GEN)cd "$(top_builddir)" && \
+       $(SHELL) ./config.status --file="src/$@"
+
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
        $(AM_V_at)rm -f -- "$@.tmp"
        $(AM_V_at)mkdir -p -- ../include
@@ -141,7 +152,7 @@ noinst_HEADERS = \
                "$(top_srcdir)/THANKS" && \
        echo ";" && \
        echo "static const char psz_authors[] =" && \
-       sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \
+       sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
                "$(top_srcdir)/AUTHORS" && \
        echo ";") >> "$@.tmp"
        $(AM_V_at)mv -f -- "$@.tmp" "$@"
@@ -214,7 +225,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
@@ -224,19 +235,14 @@ endif
 
 
 EXTRA_libvlccore_la_SOURCES = \
-       $(SOURCES_libvlc_beos) \
        $(SOURCES_libvlc_darwin) \
        $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
        $(SOURCES_libvlc_other) \
-       $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_httpd) \
        $(SOURCES_libvlc_sout) \
        $(SOURCES_libvlc_vlm) \
        $(NULL)
-if HAVE_BEOS
-libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
-else
 if HAVE_DARWIN
 libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
 else
@@ -249,15 +255,15 @@ else
 if HAVE_WINCE
 libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
 else
+if HAVE_SYMBIAN
+#libvlccore_la_SOURCES += $(SOURCES_libvlc_symbian)
+else
 libvlccore_la_SOURCES += $(SOURCES_libvlc_other)
 endif
 endif
 endif
 endif
 endif
-if BUILD_DIRENT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
-endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -268,18 +274,18 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
 endif
 endif
 
-SOURCES_libvlc_beos = \
-       misc/pthread.c \
-       $(NULL)
-
 SOURCES_libvlc_darwin = \
        config/dirs_macos.c \
+       misc/atomic.c \
+       misc/filesystem.c \
        misc/pthread.c \
        misc/darwin_specific.c \
        $(NULL)
 
 SOURCES_libvlc_linux = \
        config/dirs_xdg.c \
+       misc/atomic.c \
+       misc/filesystem.c \
        misc/pthread.c \
        misc/linux_specific.c \
        $(NULL)
@@ -287,19 +293,25 @@ SOURCES_libvlc_linux = \
 SOURCES_libvlc_win32 = \
        win32/dirs.c \
        win32/specific.c \
+       win32/atomic.c \
+       win32/filesystem.c \
        win32/thread.c \
        win32/winsock.c \
        $(NULL)
 
+SOURCES_libvlc_symbian = \
+       symbian/path.cpp \
+       symbian/dirs.c \
+       misc/atomic.c \
+       $(NULL)
+
 SOURCES_libvlc_other = \
        config/dirs_xdg.c \
+       misc/atomic.c \
+       misc/filesystem.c \
        misc/pthread.c \
        misc/not_specific.c
 
-SOURCES_libvlc_dirent = \
-       extras/dirent.c \
-       $(NULL)
-
 SOURCES_libvlc_common = \
        libvlc.c \
        libvlc.h \
@@ -375,7 +387,6 @@ SOURCES_libvlc_common = \
        video_output/postprocessing.c \
        video_output/postprocessing.h \
        video_output/video_output.c \
-       video_output/vout_pictures.c \
        video_output/video_text.c \
        video_output/video_epg.c \
        video_output/video_widgets.c \
@@ -416,6 +427,7 @@ SOURCES_libvlc_common = \
        misc/block.c \
        misc/fourcc.c \
        misc/es_format.c \
+       misc/picture.c \
        misc/picture_fifo.c \
        misc/picture_pool.c \
        modules/modules.h \
@@ -427,7 +439,6 @@ SOURCES_libvlc_common = \
        misc/threads.c \
        misc/stats.c \
        misc/cpu.c \
-       misc/action.c \
        misc/epg.c \
        misc/exit.c \
        config/configuration.h \
@@ -451,6 +462,7 @@ SOURCES_libvlc_common = \
        misc/update.c \
        misc/update_crypto.c \
        misc/xml.c \
+       misc/media_library.c \
        extras/libc.c \
        extras/tdestroy.c \
        misc/filter.c \
@@ -482,10 +494,8 @@ SOURCES_libvlc_vlm = \
 
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
-       $(OPT_SOURCES_libvlc_beos) \
        $(OPT_SOURCES_libvlc_darwin) \
        $(OPT_SOURCES_libvlc_win32) \
-       $(OPT_SOURCES_libvlc_dirent) \
        $(NULL)
 
 SOURCES_libvlc_control = \