Updated "can-pause" value.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 69a516007564a4c833996d43efac5a97477f4a3e..b2de04b059613cbf479fb2e9af9c9e9e069dd6a4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -212,6 +212,7 @@ EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_other) \
        $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_getopt) \
+       $(SOURCES_libvlc_httpd) \
        $(SOURCES_libvlc_sout) \
        $(SOURCES_libvlc_vlm) \
        $(NULL)
@@ -242,6 +243,9 @@ endif
 if BUILD_GETOPT
 libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
 endif
+if BUILD_HTTPD
+libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
+endif
 if ENABLE_SOUT
 libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
 if ENABLE_VLM
@@ -281,6 +285,7 @@ SOURCES_libvlc_common = \
        libvlc.c \
        libvlc.h \
        libvlc-module.c \
+       missing.c \
        version.c \
        interface/interface.h \
        interface/interface.c \
@@ -304,12 +309,20 @@ SOURCES_libvlc_common = \
        input/decoder_synchro.c \
        input/demux.c \
        input/es_out.c \
+       input/es_out_timeshift.c \
        input/input.c \
        input/meta.c \
+       input/access.h \
+       input/clock.h \
+       input/decoder.h \
+       input/demux.h \
+       input/es_out.h \
+       input/es_out_timeshift.h \
+       input/stream.h \
        input/input_internal.h \
        input/vlm_internal.h \
        input/stream.c \
-       input/mem_stream.c \
+       input/stream_memory.c \
        input/subtitles.c \
        input/var.c \
        video_output/video_output.c \
@@ -319,6 +332,8 @@ SOURCES_libvlc_common = \
        video_output/video_widgets.c \
        video_output/vout_subpictures.c \
        video_output/vout_intf.c \
+       video_output/vout_internal.h \
+       video_output/vout_control.h \
        audio_output/aout_internal.h \
        audio_output/common.c \
        audio_output/dec.c \
@@ -335,13 +350,13 @@ SOURCES_libvlc_common = \
        network/io.c \
        network/tcp.c \
        network/udp.c \
-       network/httpd.c \
        network/rootbind.c \
        network/tls.c \
        network/poll.c \
        text/charset.c \
        text/strings.c \
        text/unicode.c \
+       text/filesystem.c \
        text/wincp.c \
        text/iso_lang.c \
        text/iso-639_def.h \
@@ -381,6 +396,10 @@ SOURCES_libvlc_common = \
        misc/filter_chain.c \
        $(NULL)
 
+SOURCES_libvlc_httpd = \
+       network/httpd.c \
+       $(NULL)
+
 SOURCES_libvlc_sout = \
        stream_output/stream_output.c \
        stream_output/stream_output.h \
@@ -433,12 +452,11 @@ SOURCES_libvlc_control = \
 ###############################################################################
 
 misc/revision.c:
-       rm -f $@ $@.tmp
+       rm -f -- $@ $@.tmp
        echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-       REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref --head -s HEAD 2>/dev/null || echo exported)"; \
-       REVISION="$$(echo $$REVISION|cut -b -10)"; \
+       REVISION="$$(cd "$(top_srcdir)"; git describe 2>/dev/null || echo exported)"; \
        echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
-       mv -f $@.tmp $@
+       mv -f -- $@.tmp $@
 
 
 ###############################################################################