Split file path functions out of vlc_charset.h into vlc_fs.h

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 83a09f7f685a2f1a65aa60210c642640902aeb93..2f7663db0063c149add4399e5fe7aad61a45131d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,12 +34,9 @@ pkginclude_HEADERS = \
        ../include/vlc/libvlc_media_library.h \
        ../include/vlc/libvlc_media_list.h \
        ../include/vlc/libvlc_media_list_player.h \
-       ../include/vlc/libvlc_media_list_view.h \
        ../include/vlc/libvlc_media_player.h \
        ../include/vlc/libvlc_structures.h \
        ../include/vlc/libvlc_vlm.h \
-       ../include/vlc/mediacontrol.h \
-       ../include/vlc/mediacontrol_structures.h \
        $(NULL)
 
 pluginsinclude_HEADERS = \
@@ -68,6 +65,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_events.h \
        ../include/vlc_filter.h \
        ../include/vlc_fourcc.h \
+       ../include/vlc_fs.h \
        ../include/vlc_gcrypt.h \
        ../include/vlc_http.h \
        ../include/vlc_httpd.h \
@@ -128,22 +126,21 @@ noinst_HEADERS = \
        $(NULL)
 
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
-       rm -f -- "$@.tmp"
-       mkdir -p -- ../include
-       echo "/* Automatically generated file - DO NOT EDIT */" > "$@.tmp"
-       echo "static const char psz_license[] =" >> "$@.tmp"
-       sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" >> "$@.tmp"
-       echo ";" >> "$@.tmp"
-       echo "static const char psz_thanks[] =" >> "$@.tmp"
+       $(AM_V_at)rm -f -- "$@.tmp"
+       $(AM_V_at)mkdir -p -- ../include
+       $(AM_V_GEN)(echo "/* Automatically generated file - DO NOT EDIT */" && \
+       echo "static const char psz_license[] =" && \
+       sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" && \
+       echo ";" && \
+       echo "static const char psz_thanks[] =" && \
        sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
-               "$(top_srcdir)/THANKS" >> "$@.tmp"
-       echo ";" >> "$@.tmp"
-       echo "static const char psz_authors[] =" >> "$@.tmp"
+               "$(top_srcdir)/THANKS" && \
+       echo ";" && \
+       echo "static const char psz_authors[] =" && \
        sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \
-               "$(top_srcdir)/AUTHORS" >> "$@.tmp"
-       echo ";" >> "$@.tmp"
-
-       mv -f -- "$@.tmp" "$@"
+               "$(top_srcdir)/AUTHORS" && \
+       echo ";") >> "$@.tmp"
+       $(AM_V_at)mv -f -- "$@.tmp" "$@"
 
 ###############################################################################
 # pkg-config integration
@@ -154,7 +151,7 @@ pkgconfig_DATA = libvlc.pc vlc-plugin.pc
 CLEANFILES += $(pkgconfig_DATA)
 
 .pc.in.pc: $(top_builddir)/config.status
-       cd "$(top_builddir)" && \
+       $(AM_V_GEN)cd "$(top_builddir)" && \
        $(SHELL) ./config.status --file="src/$@"
 
 ##############################################################################
@@ -383,6 +380,7 @@ SOURCES_libvlc_common = \
        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 \
        video_output/vout_subpictures.c \
        video_output/window.c \
@@ -493,7 +491,6 @@ SOURCES_libvlc_control = \
        control/event_internal.h \
        control/media_internal.h \
        control/media_list_internal.h \
-       control/media_list_view_internal.h \
        control/media_player_internal.h \
        control/core.c \
        control/error.c \
@@ -504,20 +501,12 @@ SOURCES_libvlc_control = \
        control/audio.c \
        control/event.c \
        control/event_async.c \
-       control/flat_media_list_view.c \
-       control/hierarchical_media_list_view.c \
-       control/hierarchical_node_media_list_view.c \
        control/media.c \
        control/media_player.c \
        control/media_list.c \
        control/media_list_path.h \
        control/media_list_player.c \
-       control/media_list_view.c \
        control/media_library.c \
-       control/mediacontrol_internal.h \
-       control/mediacontrol_core.c \
-       control/mediacontrol_util.c \
-       control/mediacontrol_audio_video.c \
        control/media_discoverer.c
 
 ###############################################################################