bloc_test: fix meleak so we can use valgrind on it.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 21a862868d9e0606345e53cfa1241ba6a60fbd59..888751f9763914583e49b2ce8b946d772ca06e68 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,7 +46,9 @@ 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_art_finder.h \
        ../include/vlc_avcodec.h \
        ../include/vlc_bits.h \
        ../include/vlc_block.h \
@@ -66,6 +68,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 \
@@ -75,6 +78,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_messages.h \
        ../include/vlc_meta.h \
        ../include/vlc_modules.h \
+       ../include/vlc_mouse.h \
        ../include/vlc_mtime.h \
        ../include/vlc_objects.h \
        ../include/vlc_picture.h \
@@ -94,7 +98,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)
 
@@ -114,6 +119,7 @@ noinst_HEADERS = \
        ../include/vlc_tls.h \
        ../include/vlc_update.h \
        ../include/vlc_vod.h \
+       ../include/vlc_vout_wrapper.h \
        $(NULL)
 
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
@@ -121,14 +127,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 +181,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
@@ -253,22 +262,26 @@ SOURCES_libvlc_beos = \
        $(NULL)
 
 SOURCES_libvlc_darwin = \
+       config/dirs_macos.c \
        misc/pthread.c \
        misc/darwin_specific.c \
        $(NULL)
 
 SOURCES_libvlc_linux = \
+       config/dirs_xdg.c \
        misc/pthread.c \
        misc/linux_specific.c \
        $(NULL)
 
 SOURCES_libvlc_win32 = \
+       config/dirs_win.c \
        misc/w32thread.c \
        misc/win32_specific.c \
        network/winsock.c \
        $(NULL)
 
 SOURCES_libvlc_other = \
+       config/dirs_xdg.c \
        misc/pthread.c \
        misc/not_specific.c
 
@@ -340,12 +353,19 @@ SOURCES_libvlc_common = \
        input/stream_memory.c \
        input/subtitles.c \
        input/var.c \
+       video_output/display.c \
+       video_output/display.h \
+       video_output/event.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 \
@@ -392,7 +412,6 @@ SOURCES_libvlc_common = \
        misc/action.c \
        config/configuration.h \
        config/core.c \
-       config/dirs.c \
        config/chain.c \
        config/file.c \
        config/intf.c \
@@ -406,11 +425,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 +469,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 \
@@ -491,8 +513,11 @@ stamp-revision:
        rm -f -- revision.tmp
        (git --git-dir="$(top_srcdir)/.git/" describe --tags --long \
                --always || echo exported) > revision.tmp
-       diff revision.tmp revision.txt >/dev/null 2>&1 || \
-       mv -f -- revision.tmp revision.txt
+       if diff revision.tmp revision.txt >/dev/null; then \
+               rm -f -- revision.tmp; \
+       else \
+               mv -f -- revision.tmp revision.txt; \
+       fi 2>&1
 
 ###############################################################################
 # Unit/regression test