summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2010-05-25 14:01:34 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2010-05-25 14:01:34 +0100
commit28c8bfbbda8900ebf3ced78c853d96563431df61 (patch)
tree5ce573210e808c6853708ba411b0fa08f304d574 /Makefile.am
parenta53eff72d6014f83c2c5eeab30ed0506606fe990 (diff)
build: make autotools put .m4 files into m4/ instead of common/m4/
We don't want generated/copied files in common.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 120f7e9..b19b38f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = \
AUTHORS COPYING NEWS README ChangeLog gst-ffmpeg.doap \
$(win32)
-ACLOCAL_AMFLAGS = -I common/m4
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
include $(top_srcdir)/common/release.mak
@@ -24,7 +24,12 @@ check-torture:
CRUFT_FILES = \
$(top_builddir)/common/shave \
- $(top_builddir)/common/shave-libtool
+ $(top_builddir)/common/shave-libtool \
+ $(top_builddir)/common/m4/libtool.m4 \
+ $(top_builddir)/common/m4/ltoptions.m4 \
+ $(top_builddir)/common/m4/ltsugar.m4 \
+ $(top_builddir)/common/m4/ltversion.m4 \
+ $(top_builddir)/common/m4/lt~obsolete.m4
include $(top_srcdir)/common/cruft.mak