Implement dummy RTSP GET_PARAMETER so that clients can "ping"

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d3ea1c3f1c3b2da4b6b6b89ef2a7dbe3f9b0d0a8..6a04de80c00be8858c61d3ed96dd819ae8bd786c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -213,8 +213,8 @@ EXTRA_DIST += \
        extras/make.pl \
        extras/valgrind.suppressions \
        extras/m4/autoconf260.m4 \
-       extras/dbus-vlc.py \
-       extras/dbus-vlc.glade
+       extras/mpris.py \
+       extras/mpris.glade
 
 dist-hook:
        distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
@@ -249,7 +249,7 @@ nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
 vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc)
 
 vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
-vlc_LDFLAGS =
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
 if !HAVE_PLUGINS
 vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
 endif
@@ -569,7 +569,7 @@ VLC.app: vlc
            ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \
          done ; \
        fi
-       ln -sfn `pwd`/share $(top_builddir)/VLC.app/Contents/MacOS/
+       ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -736,6 +736,10 @@ package-win32-base-debug: package-win-common
        for i in $(srcdir)/share/luaplaylist/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaplaylist/`basename $${i}` ; \
        done ;
+       $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luameta
+       for i in $(srcdir)/share/luameta/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luameta/`basename $${i}` ; \
+       done ;
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
        cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"