mediacontrol API: update to use the new libvlc_media_player/libvlc_media API.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 359d4955f64352a017fc31d53bf05075b665f258..cea22989d48e22d3c245b1e6f8d005acde42f566 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,10 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
-EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym vlc-control.pc.in
+EXTRA_DIST = extras/COPYING modules/builtin.h.in \
+       vlc-control.pc.in \
+       vlc-plugin.pc.in \
+       libvlc.sym
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
@@ -20,8 +23,13 @@ pkgincludedir = $(includedir)/vlc
 
 dist_pkginclude_HEADERS = \
        ../include/vlc/vlc.h \
+       ../include/vlc/common.h \
+       ../include/vlc/deprecated.h \
        ../include/vlc/libvlc.h \
        ../include/vlc/libvlc_structures.h \
+       ../include/vlc/libvlc_media_list.h \
+       ../include/vlc/libvlc_events.h \
+       ../include/vlc/libvlc_vlm.h \
        ../include/vlc/mediacontrol.h \
        ../include/vlc/mediacontrol_structures.h \
        $(NULL)
@@ -321,6 +329,7 @@ SOURCES_libvlc_common = \
        misc/threads.c \
        misc/stats.c \
        misc/cpu.c \
+       misc/action.c \
        config/configuration.h \
        config/core.c \
        config/chain.c \
@@ -358,13 +367,12 @@ SOURCES_libvlc_control = \
        control/vlm.c \
        control/video.c \
        control/audio.c \
-       control/dynamic_media_list.c \
        control/event.c \
        control/flat_media_list_view.c \
        control/hierarchical_media_list_view.c \
        control/hierarchical_node_media_list_view.c \
-       control/media_descriptor.c \
-       control/media_instance.c \
+       control/media.c \
+       control/media_player.c \
        control/media_list.c \
        control/media_list_path.h \
        control/media_list_player.c \
@@ -374,8 +382,7 @@ SOURCES_libvlc_control = \
        control/mediacontrol_core.c \
        control/mediacontrol_util.c \
        control/mediacontrol_audio_video.c \
-       control/media_discoverer.c \
-       control/tag_query.c
+       control/media_discoverer.c
 
 ###############################################################################
 # Stamp rules
@@ -384,7 +391,8 @@ SOURCES_libvlc_control = \
 misc/revision.c:
        rm -f $@ $@.tmp
        echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-       REVISION="$$((LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported) | cut -b -10)"; \
+       REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported)"; \
+       REVISION="$$(echo $$REVISION|cut -b -10)"; \
        echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
        mv -f $@.tmp $@
 
@@ -434,7 +442,6 @@ check_PROGRAMS = \
        test_url \
        test_utf8 \
        test_headers \
-       test_control \
        $(NULL)
 
 dist_check_SCRIPTS = check_symbols
@@ -461,10 +468,6 @@ test_utf8_CFLAGS = $(CFLAGS_tests)
 test_headers_SOURCES = test/headers.c
 test_headers_CFLAGS = $(CFLAGS_tests)
 
-test_control_SOURCES = control/testapi.c
-test_control_LDADD = libvlc-control.la
-test_control_CFLAGS = $(CFLAGS_tests)
-
 check-local:
        for h in `echo $(dist_pkginclude_HEADERS) $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \
        do \