[libsigc++2] Rename scripts/ to build/ for consistency
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libsigc++2] Rename scripts/ to build/ for consistency
- Date: Sun, 16 Aug 2009 12:15:45 +0000 (UTC)
commit 155b0671500ff4180845ea75cdfec6aecd5509b5
Author: Daniel Elstner <daniel kitta gmail com>
Date: Sun Aug 16 14:13:02 2009 +0200
Rename scripts/ to build/ for consistency
* build/: Rename directory from scripts/ for consistency with most
of the other modules that switched to the new build infrastructure.
* Makefile.am (ACLOCAL_AMFLAGS): Adjust M4 include directory.
* README: Adjust a reference to scripts/ in the text.
* configure.ac (AC_CONFIG_AUX_DIR): Copy auxiliary files to build/.
(AC_CONFIG_MACRO_DIR): Place Autoconf M4 files into build/.
* docs/Makefile.am: Include $(top_srcdir)/build/doc-reference.am.
ChangeLog | 12 ++++++++++++
Makefile.am | 2 +-
README | 2 +-
{scripts => build}/.gitignore | 0
{scripts => build}/cxx.m4 | 0
{scripts => build}/cxx_std.m4 | 0
configure.ac | 4 ++--
docs/Makefile.am | 2 +-
8 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d29e9a2..a41fb88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Rename scripts/ to build/ for consistency
+
+ * build/: Rename directory from scripts/ for consistency with most
+ of the other modules that switched to the new build infrastructure.
+ * Makefile.am (ACLOCAL_AMFLAGS): Adjust M4 include directory.
+ * README: Adjust a reference to scripts/ in the text.
+ * configure.ac (AC_CONFIG_AUX_DIR): Copy auxiliary files to build/.
+ (AC_CONFIG_MACRO_DIR): Place Autoconf M4 files into build/.
+ * docs/Makefile.am: Include $(top_srcdir)/build/doc-reference.am.
+
2009-08-16 Daniel Elstner <danielk openismus com>
Update for latest mm-common 0.4
diff --git a/Makefile.am b/Makefile.am
index a9f6ae7..ec35af1 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}
if ENABLE_DOCUMENTATION
doc_subdirs = docs
diff --git a/README b/README
index f90f8f0..abb8a2f 100644
--- a/README
+++ b/README
@@ -46,7 +46,7 @@ Overview of the distribution:
sigc++/adpators/lambda/ source for library (lambda library)
sigc++/adpators/lambda/macros/ .m4 files used to auto-generate source files
- scripts/ automake junk
+ build/ auxiliary files for building
tests/ programs testing and verifying proper behaviour
diff --git a/scripts/.gitignore b/build/.gitignore
similarity index 100%
rename from scripts/.gitignore
rename to build/.gitignore
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/configure.ac b/configure.ac
index e2fbc7d..1cb0625 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,8 @@ AC_INIT([libsigc++], [2.2.3],
AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([sigc++/sigc++.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 sigc++config.h])
AM_INIT_AUTOMAKE([1.9 -Wno-portability no-define nostdinc tar-pax])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index fb448a3..9ff0e41 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -30,7 +30,7 @@ vp_select = $(or $(wildcard $(top_builddir)/sigc++/$(file)),$(top_srcdir)/sigc++
vp_search = $(foreach file,$(libsigc_h),$(vp_select))
doc_input = $(if $(srcdir:.=),$(vp_search),$(addprefix $(top_builddir)/sigc++/,$(libsigc_h)))
-include $(top_srcdir)/scripts/doc-reference.am
+include $(top_srcdir)/build/doc-reference.am
doc_imagesdir = $(libdocdir)/images
dist_libdoc_DATA = index.html
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]