[pangomm] Rename scripts/ subdirectory to build/
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pangomm] Rename scripts/ subdirectory to build/
- Date: Tue, 11 Aug 2009 16:57:08 +0000 (UTC)
commit f184ee3db522269833e35354d88d8055d5f5e8a6
Author: Daniel Elstner <danielk openismus com>
Date: Tue Aug 11 18:40:35 2009 +0200
Rename scripts/ subdirectory to build/
* configure.ac (AC_CONFIG_AUX_DIR): Point to build/ directory.
(AC_CONFIG_MACRO_DIR): ditto.
* Makefile.am (ACLOCAL_AMFLAGS): Use -I build as M4 include path.
* docs/Makefile.am, pango/{src,pangomm}/Makefile.am: Include files
from $(top_srcdir)/build/ instead of $(top_srcdir)/scripts/.
ChangeLog | 10 ++++++++++
Makefile.am | 2 +-
{scripts => build}/.gitignore | 0
configure.ac | 4 ++--
docs/Makefile.am | 2 +-
pango/pangomm/Makefile.am | 2 +-
pango/src/Makefile.am | 2 +-
7 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index acbb73a..3085372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2009-08-11 Daniel Elstner <danielk openismus com>
+ Rename scripts/ subdirectory to build/
+
+ * configure.ac (AC_CONFIG_AUX_DIR): Point to build/ directory.
+ (AC_CONFIG_MACRO_DIR): ditto.
+ * Makefile.am (ACLOCAL_AMFLAGS): Use -I build as M4 include path.
+ * docs/Makefile.am, pango/{src,pangomm}/Makefile.am: Include files
+ from $(top_srcdir)/build/ instead of $(top_srcdir)/scripts/.
+
+2009-08-11 Daniel Elstner <danielk openismus com>
+
Delete obsolete Autoconf M4 files from scripts/
* scripts/*.m4: Delete all Autoconf M4 files from version control.
diff --git a/Makefile.am b/Makefile.am
index 0d225a0..bacbb7a 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
diff --git a/scripts/.gitignore b/build/.gitignore
similarity index 100%
rename from scripts/.gitignore
rename to build/.gitignore
diff --git a/configure.ac b/configure.ac
index 9bf7094..caa00f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@ AC_INIT([pangomm], [2.24.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=pa
AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([pango/pangomm.h])
-AC_CONFIG_AUX_DIR([scripts])
-AC_CONFIG_MACRO_DIR([scripts])
+AC_CONFIG_AUX_DIR([build])
+AC_CONFIG_MACRO_DIR([build])
AC_CONFIG_HEADERS([config.h pango/pangommconfig.h])
MM_INIT_MODULE([pangomm-1.4], m4_expand([AC_PACKAGE_VERSION]))
diff --git a/docs/Makefile.am b/docs/Makefile.am
index cef088b..aed6c2b 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -30,7 +30,7 @@ htmlrefpub = http://www.gtkmm.org/docs/$(book_name)/docs/reference/html
docimagesdir = $(libdocdir)/images
dist_docimages_DATA = images/gtkmm_logo.gif images/top.gif
-include $(top_srcdir)/scripts/doc-reference.am
+include $(top_srcdir)/build/doc-reference.am
dist_noinst_DATA += \
reference/pangomm_header.html_fragment \
diff --git a/pango/pangomm/Makefile.am b/pango/pangomm/Makefile.am
index 1b52a5c..4b8f6d4 100644
--- a/pango/pangomm/Makefile.am
+++ b/pango/pangomm/Makefile.am
@@ -19,7 +19,7 @@ lib_LTLIBRARIES = libpangomm-1.4.la
include $(srcdir)/../src/filelist.am
include $(srcdir)/filelist.am
-include $(top_srcdir)/scripts/compile-binding.am
+include $(top_srcdir)/build/compile-binding.am
AM_CPPFLAGS = $(binding_includes) $(binding_cppflags) $(GTHREAD_CFLAGS) $(PANGOMM_CFLAGS)
AM_CXXFLAGS = $(PANGOMM_WXXFLAGS)
diff --git a/pango/src/Makefile.am b/pango/src/Makefile.am
index 75f8819..be5cccf 100644
--- a/pango/src/Makefile.am
+++ b/pango/src/Makefile.am
@@ -21,4 +21,4 @@ codegen_srcdir = $(top_srcdir)/tools
include $(srcdir)/filelist.am
include $(top_srcdir)/tools/m4/filelist.am
-include $(top_srcdir)/scripts/generate-binding.am
+include $(top_srcdir)/build/generate-binding.am
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]