Split out aout_mixer_t from aout_instance_t.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 21a862868d9e0606345e53cfa1241ba6a60fbd59..88416dc6933a5c3ed21a4b4269d26f69fe46a63c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,6 +46,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_access.h \
        ../include/vlc_acl.h \
        ../include/vlc_aout.h \
+       ../include/vlc_aout_mixer.h \
        ../include/vlc_arrays.h \
        ../include/vlc_avcodec.h \
        ../include/vlc_bits.h \
@@ -66,6 +67,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_filter.h \
        ../include/vlc_fourcc.h \
        ../include/vlc_gcrypt.h \
+       ../include/vlc_http.h \
        ../include/vlc_httpd.h \
        ../include/vlc_image.h \
        ../include/vlc_input.h \
@@ -94,7 +96,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)
 
@@ -121,14 +124,17 @@ noinst_HEADERS = \
        mkdir -p -- ../include
        echo "/* Automatically generated file - DO NOT EDIT */" > "$@.tmp"
        echo "static const char psz_license[] =" >> "$@.tmp"
-       cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
+       sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" >> "$@.tmp"
        echo ";" >> "$@.tmp"
        echo "static const char psz_thanks[] =" >> "$@.tmp"
-       grep -v '$$Id:'  $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp"
+       sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
+               "$(top_srcdir)/THANKS" >> "$@.tmp"
        echo ";" >> "$@.tmp"
        echo "static const char psz_authors[] =" >> "$@.tmp"
-       grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
+       sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \
+               "$(top_srcdir)/AUTHORS" >> "$@.tmp"
        echo ";" >> "$@.tmp"
+
        mv -f -- "$@.tmp" "$@"
 
 ###############################################################################
@@ -172,7 +178,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
@@ -340,12 +346,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 \
@@ -406,11 +418,13 @@ SOURCES_libvlc_common = \
        misc/error.c \
        misc/update.h \
        misc/update.c \
+       misc/update_crypto.c \
        misc/xml.c \
        misc/devices.c \
        extras/libc.c \
        misc/filter.c \
        misc/filter_chain.c \
+       misc/http_auth.c \
        $(NULL)
 
 SOURCES_libvlc_httpd = \
@@ -448,6 +462,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 \