Merge mediacontrol to trunk

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0f9f07df43212cba07ab6c23e6074c395367d7d9..521c08109ff39edbb05f0e54515968699b8ef597 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,6 +60,7 @@ dist_pkginclude_HEADERS = \
        include/vlc/decoder.h \
        include/vlc/input.h \
        include/vlc/intf.h \
+       include/vlc/control.h \
        $(NULL)
 
 noinst_HEADERS = $(HEADERS_include) $(HEADERS_include_built)
@@ -412,6 +413,9 @@ SOURCES_libvlc_common = \
        src/misc/vlm.c \
        src/misc/xml.c \
        src/extras/libc.c \
+       src/control/core.c \
+       src/control/util.c \
+       src/control/audio_video.c \
        $(NULL)
 
 SOURCES_libvlc = \