Merge commit 'origin/master-tx'

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a41dc6c8551470df31e5928f4f20883a99020f5d..9a3ca7b719d7d80a87b03460bb528eda71fa077a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
 # This file is part of PulseAudio.
 #
 # PulseAudio is free software; you can redistribute it and/or modify
@@ -17,8 +15,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+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
+SUBDIRS = src doxygen man po
 
 MAINTAINERCLEANFILES =
 noinst_DATA =
@@ -52,13 +52,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).svn`date +%Y%m%d`.tar.gz
+       cp $(distdir).tar.gz $$HOME/cvs.fedora/pulseaudio/devel/$(distdir).git`date +%Y%m%d`.tar.gz
 
 dist-hook:
-       if test -d .svn ; then \
-               svn update ; \
+       if test -d .git ; then \
+               test -z $$SKIP_GIT && git pull ; \
                chmod u+w ${distdir}/ChangeLog || true ; \
-               svn2cl -o ${distdir}/ChangeLog ; \
+               ( git-changelog.perl || echo "git-changelog.perl failed." ) > ${distdir}/ChangeLog 2>&1 ; \
        fi
 
+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
+
+DISTCLEANFILES = \
+        po/.intltool-merge-cache