Merge remote branch 'origin/master-tx'

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 63c04ee1534832e443ff2925a21e6e68c0c3da09..2713c0a270704656a79743c87dbcf021398bf62d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,14 +15,29 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-ACLOCAL_AMFLAGS = -I common
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
-SUBDIRS=src doxygen man po
+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
 
@@ -52,16 +67,22 @@ 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/cvs.fedora/pulseaudio/devel/$(distdir).tar.gz
 
 dist-hook:
        if test -d .git ; then \
-               git pull ; \
+               test -z $$SKIP_GIT && git pull ; \
                chmod u+w ${distdir}/ChangeLog || true ; \
-               git-changelog.perl > ${distdir}/ChangeLog ; \
+               ( git-changelog.perl || echo "git-changelog.perl failed." ) > ${distdir}/ChangeLog 2>&1 ; \
        fi
+       echo $(VERSION) > $(distdir)/.tarball-version
 
 .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