Merge remote branch 'origin/master-tx'

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2448e7489f4e19696c7a756c0474a78766df2b8e..2713c0a270704656a79743c87dbcf021398bf62d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,12 +17,27 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
+EXTRA_DIST = \
+       bootstrap.sh \
+       git-version-gen \
+       LICENSE \
+       GPL \
+       LGPL \
+       doxygen/Makefile.am \
+       doxygen/Makefile.in \
+       doxygen/doxygen.conf.in \
+       README \
+       todo \
+       vala/libpulse.vapi
+
 SUBDIRS = src doxygen man po
 
 MAINTAINERCLEANFILES =
 noinst_DATA =
 
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = vala/libpulse.vapi
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpulse.pc libpulse-simple.pc
 
@@ -62,12 +77,6 @@ dist-hook:
        fi
        echo $(VERSION) > $(distdir)/.tarball-version
 
-update-shave:
-       for i in shave.in shave.m4 shave-libtool.in; do \
-               wget -O $$i http://git.lespiau.name/cgit/shave/blob/\?path=shave/$$i ; \
-       done
-       mv shave.m4 m4/
-
 .PHONY: homepage distcleancheck doxygen
 
 # see git-version-gen