Merge commit 'flameeyes/flameeyes'

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8aa609f6ca3504afbab049fe144aacccfbffdebb..8735d312be5cb4cda822b9d5203609c1fb6e72dd 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=libltdl src doxygen
+SUBDIRS = src doxygen man po
 
 MAINTAINERCLEANFILES =
 noinst_DATA =
@@ -36,11 +36,6 @@ pkgconfig_DATA += \
         libpulse-mainloop-glib.pc
 endif
 
-if HAVE_GLIB12
-pkgconfig_DATA += \
-       libpulse-mainloop-glib12.pc
-endif
-
 homepage: all dist doxygen
        test -d $$HOME/homepage/private
        mkdir -p $$HOME/homepage/private/projects/pulseaudio $$HOME/homepage/private/projects/pulseaudio/doxygen
@@ -50,4 +45,23 @@ homepage: all dist doxygen
 doxygen:
        $(MAKE) -C doxygen doxygen
 
+eolspace:
+       find \( -name '*.c' -o -name '*.h' -o -name 'Makefile.am' \) -exec perl -i -pe 's/\s+\n$$/\1\n/;' \{\} \;
+
+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
+
+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
+
 .PHONY: homepage distcleancheck doxygen
+
+DISTCLEANFILES = \
+        po/.intltool-merge-cache