commit 27a00086567ddfcafa66ee6a1c98be714285903a
Author: Daniel Elstner <daniel kitta gmail com>
Date: Sun Aug 16 16:09:06 2009 +0200
Move M4 files from scripts/ over to build/
* scripts/*.m4: Move files over to the build/ directory, in order
to be more consistent with the directory layout of other binding
modules that switched to the new build organization.
* Makefile.am (ACLOCAL_AMFLAGS): Search build/ for M4 files.
(dist_aclocal_macro_DATA): Adjust directory prefix to build/.
* configure.ac (AC_CONFIG_MACRO_DIR): Place third-party Autoconf
macros into the build/ directory.
.gitignore | 18 +++++++++---------
ChangeLog | 12 ++++++++++++
Makefile.am | 4 ++--
{scripts => build}/c_std.m4 | 0
{scripts => build}/cxx.m4 | 0
{scripts => build}/cxx_std.m4 | 0
{scripts => build}/dk-feature.m4 | 0
{scripts => build}/glibmm_check_perl.m4 | 0
{scripts => build}/macros.m4 | 0
{scripts => build}/reduced.m4 | 0
{scripts => build}/sun.m4 | 0
configure.ac | 2 +-
12 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf5f537..e2f2d40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,15 @@ giommconfig.h
/libtool
/glibmm-*.tar.*
+# scripts/
+/build/config.*
+/build/depcomp
+/build/install-sh
+/build/ltmain.sh
+/build/libtool.m4
+/build/lt*.m4
+/build/missing
+
# MSVC_Net2005/
/MSVC_Net200[58]/giomm/giomm.rc
/MSVC_Net200[58]/glibmm/glibmm.rc
@@ -115,15 +124,6 @@ giommconfig.h
/glib/glibmm/wrap_init.cc
/glib/glibmm/private/*_p.h
-# scripts/
-/scripts/config.*
-/scripts/depcomp
-/scripts/install-sh
-/scripts/ltmain.sh
-/scripts/libtool.m4
-/scripts/lt*.m4
-/scripts/missing
-
# tests/
/tests/*/test
diff --git a/ChangeLog b/ChangeLog
index 918b9f5..f99d7fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2009-08-16 Daniel Elstner <daniel kitta gmail com>
+ Move M4 files from scripts/ over to build/
+
+ * scripts/*.m4: Move files over to the build/ directory, in order
+ to be more consistent with the directory layout of other binding
+ modules that switched to the new build organization.
+ * Makefile.am (ACLOCAL_AMFLAGS): Search build/ for M4 files.
+ (dist_aclocal_macro_DATA): Adjust directory prefix to build/.
+ * configure.ac (AC_CONFIG_MACRO_DIR): Place third-party Autoconf
+ macros into the build/ directory.
+
+2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
Use hammer method to avoid admitting to be wrong
* glib/README, gio/README: Oops, looks like I was wrong in my
diff --git a/Makefile.am b/Makefile.am
index 797c027..b45cf50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU Lesser General Public License
## along with this library. If not, see <http://www.gnu.org/licenses/>.
-ACLOCAL_AMFLAGS = -I scripts ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
if MAINTAINER_MODE
@@ -57,4 +57,4 @@ DISTCLEANFILES = $(filter %mmconfig.h,$(msvc_files))
# TODO: Obsolete; remove after grace period.
aclocal_macrodir = $(datadir)/aclocal
-dist_aclocal_macro_DATA = scripts/glibmm_check_perl.m4
+dist_aclocal_macro_DATA = build/glibmm_check_perl.m4
diff --git a/scripts/c_std.m4 b/build/c_std.m4
similarity index 100%
rename from scripts/c_std.m4
rename to build/c_std.m4
diff --git a/scripts/cxx.m4 b/build/cxx.m4
similarity index 100%
rename from scripts/cxx.m4
rename to build/cxx.m4
diff --git a/scripts/cxx_std.m4 b/build/cxx_std.m4
similarity index 100%
rename from scripts/cxx_std.m4
rename to build/cxx_std.m4
diff --git a/scripts/dk-feature.m4 b/build/dk-feature.m4
similarity index 100%
rename from scripts/dk-feature.m4
rename to build/dk-feature.m4
diff --git a/scripts/glibmm_check_perl.m4 b/build/glibmm_check_perl.m4
similarity index 100%
rename from scripts/glibmm_check_perl.m4
rename to build/glibmm_check_perl.m4
diff --git a/scripts/macros.m4 b/build/macros.m4
similarity index 100%
rename from scripts/macros.m4
rename to build/macros.m4
diff --git a/scripts/reduced.m4 b/build/reduced.m4
similarity index 100%
rename from scripts/reduced.m4
rename to build/reduced.m4
diff --git a/scripts/sun.m4 b/build/sun.m4
similarity index 100%
rename from scripts/sun.m4
rename to build/sun.m4
diff --git a/configure.ac b/configure.ac
index d056ce2..053101a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([glib/glibmm.h])
AC_CONFIG_AUX_DIR([build])
-AC_CONFIG_MACRO_DIR([scripts])
+AC_CONFIG_MACRO_DIR([build])
AC_CONFIG_HEADERS([config.h glib/glibmmconfig.h gio/giommconfig.h])
AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc tar-pax])