Merge branch 'master' of git://git.0pointer.de/pulseaudio

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b32b46e99afa708ff2dafaa17b9fd8213a4de7db..facce0df51051692bb8ee7789f307d06b4bf916d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,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 =
@@ -60,3 +62,6 @@ dist-hook:
        fi
 
 .PHONY: homepage distcleancheck doxygen
+
+DISTCLEANFILES = \
+        po/.intltool-merge-cache