diff options
| -rw-r--r-- | .gitignore | 18 | ||||
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | build/c_std.m4 (renamed from scripts/c_std.m4) | 0 | ||||
| -rw-r--r-- | build/cxx.m4 (renamed from scripts/cxx.m4) | 0 | ||||
| -rw-r--r-- | build/cxx_std.m4 (renamed from scripts/cxx_std.m4) | 0 | ||||
| -rw-r--r-- | build/dk-feature.m4 (renamed from scripts/dk-feature.m4) | 0 | ||||
| -rw-r--r-- | build/glibmm_check_perl.m4 (renamed from scripts/glibmm_check_perl.m4) | 0 | ||||
| -rw-r--r-- | build/macros.m4 (renamed from scripts/macros.m4) | 0 | ||||
| -rw-r--r-- | build/reduced.m4 (renamed from scripts/reduced.m4) | 0 | ||||
| -rw-r--r-- | build/sun.m4 (renamed from scripts/sun.m4) | 0 | ||||
| -rw-r--r-- | configure.ac | 2 |
12 files changed, 24 insertions, 12 deletions
@@ -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 @@ -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 797c027e..b45cf50f 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 index f4a8b56f..f4a8b56f 100644 --- a/scripts/c_std.m4 +++ b/build/c_std.m4 diff --git a/scripts/cxx.m4 b/build/cxx.m4 index 37062b75..37062b75 100644 --- a/scripts/cxx.m4 +++ b/build/cxx.m4 diff --git a/scripts/cxx_std.m4 b/build/cxx_std.m4 index aa3d5c90..aa3d5c90 100644 --- a/scripts/cxx_std.m4 +++ b/build/cxx_std.m4 diff --git a/scripts/dk-feature.m4 b/build/dk-feature.m4 index 87a0e26e..87a0e26e 100644 --- a/scripts/dk-feature.m4 +++ b/build/dk-feature.m4 diff --git a/scripts/glibmm_check_perl.m4 b/build/glibmm_check_perl.m4 index 62519e5c..62519e5c 100644 --- a/scripts/glibmm_check_perl.m4 +++ b/build/glibmm_check_perl.m4 diff --git a/scripts/macros.m4 b/build/macros.m4 index 14708e47..14708e47 100644 --- a/scripts/macros.m4 +++ b/build/macros.m4 diff --git a/scripts/reduced.m4 b/build/reduced.m4 index 9411a578..9411a578 100644 --- a/scripts/reduced.m4 +++ b/build/reduced.m4 diff --git a/scripts/sun.m4 b/build/sun.m4 index 6b8950f7..6b8950f7 100644 --- a/scripts/sun.m4 +++ b/build/sun.m4 diff --git a/configure.ac b/configure.ac index d056ce2e..053101ad 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]) |