GNOME.org
 

[gtkmm] Rename scripts/ to build/ for consistency

commit 8505a3b5792d4ca0952e6008a822b1263817af6d
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sun Aug 16 20:44:09 2009 +0200

    Rename scripts/ to build/ for consistency
    
    * build/: Rename directory from scripts/ for consistency with the
    other binding modules that switched to the new build system.
    * configure.ac (AC_CONFIG_AUX_DIR): Change to build/ directory.
    (AC_CONFIG_MACRO_DIR): ditto.
    * Makefile.am (ACLOCAL_AMFLAGS): Include M4 files from build/.
    * {atk,gdk,gtk}/*/Makefile.am: Include mm-common build files from
    $(top_srcdir)/build/.
    * docs/Makefile.am: ditto.

 ChangeLog                     |   13 +++++++++++++
 Makefile.am                   |    2 +-
 atk/atkmm/Makefile.am         |    2 +-
 atk/src/Makefile.am           |    2 +-
 {scripts => build}/.gitignore |    0
 {scripts => build}/reduced.m4 |    0
 configure.ac                  |    4 ++--
 docs/Makefile.am              |    2 +-
 gdk/gdkmm/Makefile.am         |    2 +-
 gdk/src/Makefile.am           |    2 +-
 gtk/gtkmm/Makefile.am         |    2 +-
 gtk/src/Makefile.am           |    2 +-
 12 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 83385e2..32b47ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-08-16  Daniel Elstner  <daniel kitta gmail com>
+
+	Rename scripts/ to build/ for consistency
+
+	* build/: Rename directory from scripts/ for consistency with the
+	other binding modules that switched to the new build system.
+	* configure.ac (AC_CONFIG_AUX_DIR): Change to build/ directory.
+	(AC_CONFIG_MACRO_DIR): ditto.
+	* Makefile.am (ACLOCAL_AMFLAGS): Include M4 files from build/.
+	* {atk,gdk,gtk}/*/Makefile.am: Include mm-common build files from
+	$(top_srcdir)/build/.
+	* docs/Makefile.am: ditto.
+
 2009-08-13  Daniel Elstner  <daniel kitta gmail com>
 
 	Reference new canonical name of cairomm tag file
diff --git a/Makefile.am b/Makefile.am
index fbba2b4..c60b5c7 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 GTKMM_ATKMM_ENABLED
diff --git a/atk/atkmm/Makefile.am b/atk/atkmm/Makefile.am
index 09d66a7..b8ed624 100644
--- a/atk/atkmm/Makefile.am
+++ b/atk/atkmm/Makefile.am
@@ -27,7 +27,7 @@ files_extra_cc = $(atkmm_files_extra_cc)
 files_extra_h  = $(atkmm_files_extra_h)
 files_extra_ph = $(atkmm_files_extra_ph)
 
-include $(top_srcdir)/scripts/compile-binding.am
+include $(top_srcdir)/build/compile-binding.am
 
 AM_CPPFLAGS = $(binding_includes) $(binding_cppflags) $(GTHREAD_CFLAGS) $(ATKMM_CFLAGS)
 AM_CXXFLAGS = $(GTKMM_WXXFLAGS)
diff --git a/atk/src/Makefile.am b/atk/src/Makefile.am
index d9791fd..a8a3e77 100644
--- a/atk/src/Makefile.am
+++ b/atk/src/Makefile.am
@@ -26,4 +26,4 @@ files_defs = $(atkmm_files_defs)
 files_ccg  = $(atkmm_files_ccg)
 files_hg   = $(atkmm_files_hg)
 
-include $(top_srcdir)/scripts/generate-binding.am
+include $(top_srcdir)/build/generate-binding.am
diff --git a/scripts/.gitignore b/build/.gitignore
similarity index 100%
rename from scripts/.gitignore
rename to build/.gitignore
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/configure.ac b/configure.ac
index d36b72d..116f3d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@ AC_INIT([gtkmm], [2.17.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkm
 AC_PREREQ([2.59])
 
 AC_CONFIG_SRCDIR([gtk/gtkmm.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 gdk/gdkmmconfig.h gtk/gtkmmconfig.h])
 
 MM_INIT_MODULE([atkmm-1.6], m4_expand([AC_PACKAGE_VERSION]))
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 3013ba4..646e974 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -38,7 +38,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/gtkmm_header.html_fragment	\
diff --git a/gdk/gdkmm/Makefile.am b/gdk/gdkmm/Makefile.am
index 2e72c32..7900169 100644
--- a/gdk/gdkmm/Makefile.am
+++ b/gdk/gdkmm/Makefile.am
@@ -27,7 +27,7 @@ files_extra_cc = $(gdkmm_files_extra_cc)
 files_extra_h  = $(gdkmm_files_extra_h)
 files_extra_ph = $(gdkmm_files_extra_ph)
 
-include $(top_srcdir)/scripts/compile-binding.am
+include $(top_srcdir)/build/compile-binding.am
 
 AM_CPPFLAGS = $(binding_includes) $(binding_cppflags) $(GTHREAD_CFLAGS) $(GDKMM_CFLAGS)
 AM_CXXFLAGS = $(GTKMM_WXXFLAGS)
diff --git a/gdk/src/Makefile.am b/gdk/src/Makefile.am
index 468ebac..038b87e 100644
--- a/gdk/src/Makefile.am
+++ b/gdk/src/Makefile.am
@@ -26,4 +26,4 @@ files_defs = $(gdkmm_files_defs)
 files_ccg  = $(gdkmm_files_ccg)
 files_hg   = $(gdkmm_files_hg)
 
-include $(top_srcdir)/scripts/generate-binding.am
+include $(top_srcdir)/build/generate-binding.am
diff --git a/gtk/gtkmm/Makefile.am b/gtk/gtkmm/Makefile.am
index fc42b32..9617559 100644
--- a/gtk/gtkmm/Makefile.am
+++ b/gtk/gtkmm/Makefile.am
@@ -37,7 +37,7 @@ endif
 local_includes = -I$(top_builddir)/gdk $(if $(srcdir:.=),-I$(top_srcdir)/gdk) $(atkmm_includes)
 local_libadd   = $(atkmm_libadd) $(top_builddir)/gdk/gdkmm/libgdkmm-$(GDKMM_API_VERSION).la
 
-include $(top_srcdir)/scripts/compile-binding.am
+include $(top_srcdir)/build/compile-binding.am
 
 local_cppflags = $(binding_includes) $(local_includes) $(binding_cppflags)
 
diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 62c5cb8..6af79a1 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -26,4 +26,4 @@ files_defs = $(gtkmm_files_defs)
 files_ccg  = $(gtkmm_files_ccg)
 files_hg   = $(gtkmm_files_hg)
 
-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]