fix testapi test: libvlc_instance_(play|pause|stop) are asynchronous, so wait for...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 498d5cd776bff64b8d422229877d5c74c0c77525..88d5703b6bec0363add71f6054d36678fa87c5fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -217,7 +217,6 @@ EXTRA_DIST += \
        extras/analyser/vlc.vim \
        extras/analyser/valgrind.suppressions \
        extras/buildsystem/make.pl \
-       extras/buildsystem/autotools/m4/autoconf260.m4 \
        extras/misc/mpris.py \
        extras/misc/mpris.glade
 
@@ -289,7 +288,9 @@ endif
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS += $(ALIASES)
 CLEANFILES += $(ALIASES)
+if BUILD_VLC
 EXTRA_SCRIPTS = $(ALL_ALIASES)
+endif
 
 dist_noinst_SCRIPTS += make-alias
 
@@ -313,7 +314,9 @@ qvlc: make-alias
 nvlc: make-alias
        $(MKALIAS) ncurses
 
+if BUILD_VLC
 noinst_SCRIPTS = vlc$(EXEEXT)
+endif
 
 vlc$(EXEEXT): core
        rm -f vlc$(EXEEXT)
@@ -326,7 +329,9 @@ vlc$(EXEEXT): core
 
 if HAVE_DARWIN
 # Create the MacOS X app
+if BUILD_VLC
 noinst_DATA = VLC.app
+endif
 # VLC-release.app is the old VLC.app target
 VLC-release.app: vlc
        ( cd src && make install )