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

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f4dd998904dc683a48021aced64c3005b2d0ee8d..b0b255348b8c1a277730fc30f56d9c88cd17285a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,29 +17,57 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
-SUBDIRS = libltdl src doxygen man po
+EXTRA_DIST = \
+       bootstrap.sh \
+       git-version-gen \
+       LICENSE \
+       GPL \
+       LGPL \
+       doxygen/Makefile.am \
+       doxygen/Makefile.in \
+       doxygen/doxygen.conf.in \
+       PROTOCOL \
+       README \
+       todo \
+       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
 
 MAINTAINERCLEANFILES =
 noinst_DATA =
 
+vapidir = $(datadir)/vala/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
        cp pulseaudio-@PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/pulseaudio
+       cp pulseaudio-@PACKAGE_VERSION@.tar.gz $$HOME/git.fedora/pulseaudio
        cp -a doxygen/html/* $$HOME/homepage/private/projects/pulseaudio/doxygen
 
 doxygen:
@@ -52,16 +80,23 @@ untabify:
        find \( -name '*.c' -o -name '*.h' \) -exec perl -i -pe 's/\t/        /g;' \{\} \;
 
 fedora-snapshot: dist
-       cp $(distdir).tar.gz $$HOME/cvs.fedora/pulseaudio/devel/$(distdir).git`date +%Y%m%d`.tar.gz
+       cp $(distdir).tar.gz $$HOME/git.fedora/pulseaudio/$(distdir).tar.gz
 
 dist-hook:
-       if test -d .git ; then \
-               test -z $$SKIP_GIT && git pull ; \
-               chmod u+w ${distdir}/ChangeLog || true ; \
-               ( 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
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
+       echo $(VERSION) > $@-t && mv $@-t $@
+
 DISTCLEANFILES = \
         po/.intltool-merge-cache
+
+DISTCHECK_CONFIGURE_FLAGS = --with-udev-rules-dir="$$dc_install_base/lib/udev/rules.d"