pactl: Stop parsing option when the first non-option is encountered

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 936e01910fc33b8c2bdc56b78e9e31d0d0eb61e0..b0b255348b8c1a277730fc30f56d9c88cd17285a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,10 +26,18 @@ EXTRA_DIST = \
        doxygen/Makefile.am \
        doxygen/Makefile.in \
        doxygen/doxygen.conf.in \
+       PROTOCOL \
        README \
        todo \
-       vala/libpulse.deps \
-       vala/libpulse.vapi
+       shell-completion/pulseaudio-zsh-completion.zsh \
+       .gitignore \
+       doxygen/.gitignore \
+       m4/.gitignore \
+       man/.gitignore \
+       po/.gitignore \
+       src/.gitignore \
+       src/daemon/.gitignore \
+       src/pulse/.gitignore
 
 SUBDIRS = src doxygen man po
 
@@ -37,21 +45,24 @@ MAINTAINERCLEANFILES =
 noinst_DATA =
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = vala/libpulse.deps vala/libpulse.vapi
+dist_vapi_DATA = \
+               vala/libpulse.deps vala/libpulse.vapi \
+               vala/libpulse-mainloop-glib.deps vala/libpulse-mainloop-glib.vapi
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpulse.pc libpulse-simple.pc
 
-if HAVE_AVAHI
-pkgconfig_DATA += \
-        libpulse-browse.pc
-endif
-
 if HAVE_GLIB20
 pkgconfig_DATA += \
         libpulse-mainloop-glib.pc
 endif
 
+cmakedir = $(libdir)/cmake/PulseAudio
+cmake_DATA = PulseAudioConfig.cmake PulseAudioConfigVersion.cmake
+
+bashcompletiondir=$(sysconfdir)/bash_completion.d
+dist_bashcompletion_DATA = shell-completion/pulseaudio-bash-completion.sh
+
 homepage: all dist doxygen
        test -d $$HOME/homepage/private
        mkdir -p $$HOME/homepage/private/projects/pulseaudio $$HOME/homepage/private/projects/pulseaudio/doxygen
@@ -72,14 +83,12 @@ fedora-snapshot: dist
        cp $(distdir).tar.gz $$HOME/git.fedora/pulseaudio/$(distdir).tar.gz
 
 dist-hook:
-       if test -d .git ; then \
-               test -z $$USE_GIT || git pull ; \
-               test -f ${distdir}/ChangeLog && chmod u+w ${distdir}/ChangeLog ; \
-               ( git-changelog.perl || echo "git-changelog.perl failed." ) > ${distdir}/ChangeLog 2>&1 ; \
-       fi
        echo $(VERSION) > $(distdir)/.tarball-version
        echo $(VERSION) > $(distdir)/.version
 
+check-daemon:
+       $(MAKE) -C src check-daemon
+
 .PHONY: homepage distcleancheck doxygen
 
 # see git-version-gen