From 0d84a87098cd54eb008a63739e04e4e172e467c0 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Mon, 5 Jan 2009 11:51:56 +0000
Subject: [PATCH] Don't traverse m4macros/ and add the files to EXTRA_DIST in
 ./Makefile.am for speed.

Originally committed to SVN as r2652.
---
 Makefile.am          | 14 ++++++++++++--
 configure.in         |  1 -
 m4macros/Makefile.am |  6 ------
 3 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 m4macros/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f073e7a65..e1fdeb3a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,7 @@ SUBDIRS = \
 	$(ffmpegsource) \
 	aegisub \
 	automation \
-	po \
-	m4macros
+	po
 
 osx-bundle:
 	@SHELL@ scripts/osx-bundle.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@
@@ -46,3 +45,14 @@ EXTRA_DIST = \
 	mkinstalldirs \
 	INSTALL \
 	README
+
+# m4macros/
+EXTRA_DIST += \
+	m4macros/check_gnu_make.m4 \
+	m4macros/acx_pthread.m4 \
+	m4macros/ac_agi.m4 \
+	m4macros/ax_lang_compiler_ms.m4 \
+	m4macros/ac_agi_mdcpucfg.m4 \
+	m4macros/ax_openmp.m4 \
+	m4macros/ax_check_gl.m4 \
+	m4macros/ac_flag.m4
diff --git a/configure.in b/configure.in
index 7b790d55b..511a430a4 100644
--- a/configure.in
+++ b/configure.in
@@ -1038,7 +1038,6 @@ auto3/Makefile
 libass/Makefile
 automation/Makefile
 po/Makefile.in
-m4macros/Makefile
 ])
 
 # Files that need substitution.
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
deleted file mode 100644
index 6f77e0af0..000000000
--- a/m4macros/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = \
-	ac_flag.m4 \
-	acx_pthread.m4 \
-	ax_check_gl.m4 \
-	ax_lang_compiler_ms.m4 \
-	check_gnu_make.m4