Include the "build" module in GLib, too, to make it more self-contained.

2000-07-15  Tor Lillqvist  <tml@iki.fi>

* Makefile.am (SUBDIRS): Include the "build" module in GLib, too,
to make it more self-contained. If your CVS client doesn't
automatically get it, do a cvs get build in glib.

* */makefile.mingw.in: Include make.mingw from build in the glib
source directory.

diff --git a/ChangeLog b/ChangeLog
index bdb39d61fd6641763f9dd807b424ebce3546e69f..6a4ad43708d3fe32c1f0fc0c1d857da66d6edbd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-07-15  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (SUBDIRS): Include the "build" module in GLib, too,
+       to make it more self-contained. If your CVS client doesn't
+       automatically get it, do a cvs get build in glib.
+
+       * */makefile.mingw.in: Include make.mingw from build in the glib
+       source directory.
+
 Fri Jul 14 16:26:35 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bdb39d61fd6641763f9dd807b424ebce3546e69f..6a4ad43708d3fe32c1f0fc0c1d857da66d6edbd9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2000-07-15  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (SUBDIRS): Include the "build" module in GLib, too,
+       to make it more self-contained. If your CVS client doesn't
+       automatically get it, do a cvs get build in glib.
+
+       * */makefile.mingw.in: Include make.mingw from build in the glib
+       source directory.
+
 Fri Jul 14 16:26:35 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bdb39d61fd6641763f9dd807b424ebce3546e69f..6a4ad43708d3fe32c1f0fc0c1d857da66d6edbd9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2000-07-15  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (SUBDIRS): Include the "build" module in GLib, too,
+       to make it more self-contained. If your CVS client doesn't
+       automatically get it, do a cvs get build in glib.
+
+       * */makefile.mingw.in: Include make.mingw from build in the glib
+       source directory.
+
 Fri Jul 14 16:26:35 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index bdb39d61fd6641763f9dd807b424ebce3546e69f..6a4ad43708d3fe32c1f0fc0c1d857da66d6edbd9 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+2000-07-15  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (SUBDIRS): Include the "build" module in GLib, too,
+       to make it more self-contained. If your CVS client doesn't
+       automatically get it, do a cvs get build in glib.
+
+       * */makefile.mingw.in: Include make.mingw from build in the glib
+       source directory.
+
 Fri Jul 14 16:26:35 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bdb39d61fd6641763f9dd807b424ebce3546e69f..6a4ad43708d3fe32c1f0fc0c1d857da66d6edbd9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2000-07-15  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (SUBDIRS): Include the "build" module in GLib, too,
+       to make it more self-contained. If your CVS client doesn't
+       automatically get it, do a cvs get build in glib.
+
+       * */makefile.mingw.in: Include make.mingw from build in the glib
+       source directory.
+
 Fri Jul 14 16:26:35 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bdb39d61fd6641763f9dd807b424ebce3546e69f..6a4ad43708d3fe32c1f0fc0c1d857da66d6edbd9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2000-07-15  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (SUBDIRS): Include the "build" module in GLib, too,
+       to make it more self-contained. If your CVS client doesn't
+       automatically get it, do a cvs get build in glib.
+
+       * */makefile.mingw.in: Include make.mingw from build in the glib
+       source directory.
+
 Fri Jul 14 16:26:35 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bdb39d61fd6641763f9dd807b424ebce3546e69f..6a4ad43708d3fe32c1f0fc0c1d857da66d6edbd9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2000-07-15  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (SUBDIRS): Include the "build" module in GLib, too,
+       to make it more self-contained. If your CVS client doesn't
+       automatically get it, do a cvs get build in glib.
+
+       * */makefile.mingw.in: Include make.mingw from build in the glib
+       source directory.
+
 Fri Jul 14 16:26:35 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bdb39d61fd6641763f9dd807b424ebce3546e69f..6a4ad43708d3fe32c1f0fc0c1d857da66d6edbd9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2000-07-15  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (SUBDIRS): Include the "build" module in GLib, too,
+       to make it more self-contained. If your CVS client doesn't
+       automatically get it, do a cvs get build in glib.
+
+       * */makefile.mingw.in: Include make.mingw from build in the glib
+       source directory.
+
 Fri Jul 14 16:26:35 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/Makefile.am b/Makefile.am
index 8014870b0d7f2d1d770baf1b24dcf72329e94877..ea0bce5eed44bbad273f34a53d8439ea881fecab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = . gobject gmodule gthread docs tests
+SUBDIRS = . gobject gmodule gthread docs tests build
 
 bin_SCRIPTS=glib-config-2.0
 BUILT_SOURCES=glib-config-2.0

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 8014870b0d7f2d1d770baf1b24dcf72329e94877..ea0bce5eed44bbad273f34a53d8439ea881fecab 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = . gobject gmodule gthread docs tests
+SUBDIRS = . gobject gmodule gthread docs tests build
 
 bin_SCRIPTS=glib-config-2.0
 BUILT_SOURCES=glib-config-2.0

diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in
index 2a4ab78a9d1d30b760145a2c4c4c1f22700daa5f..62eb80acad2bbd77330e1272ec5b5e9637488564 100644 (file)
--- a/glib/makefile.mingw.in
+++ b/glib/makefile.mingw.in
@@ -11,7 +11,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 TOP = ..
 
-include $(TOP)/build/win32/make.mingw
+include build/win32/make.mingw
 
 ################################################################
 

diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in
index 2c9c9034afb226a7fe4e6f1c7a072f4cbc97614d..6ae721404b50b7b111dd7a7b5658abe3f1dfa62b 100644 (file)
--- a/gmodule/makefile.mingw.in
+++ b/gmodule/makefile.mingw.in
@@ -7,7 +7,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 TOP = ../..
 
-include $(TOP)/build/win32/make.mingw
+include ../build/win32/make.mingw
 
 ################################################################
 

diff --git a/gobject/makefile.mingw.in b/gobject/makefile.mingw.in
index 47ab9cb8cda9fc561a0caa4c5e20eb4950b5d657..fd6db1791b9b2f73bf11bc5bf9507a825180bbfe 100644 (file)
--- a/gobject/makefile.mingw.in
+++ b/gobject/makefile.mingw.in
@@ -7,7 +7,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 TOP = ../..
 
-include $(TOP)/build/win32/make.mingw
+include ../build/win32/make.mingw
 
 ################################################################
 

diff --git a/gthread/makefile.mingw.in b/gthread/makefile.mingw.in
index 47e7863bfb20921addff8e33b3d4850074d5fcf2..d0739dd87c1024e2fcc17bc87a7a5ada476cace6 100644 (file)
--- a/gthread/makefile.mingw.in
+++ b/gthread/makefile.mingw.in
@@ -14,7 +14,7 @@ PTHREADS = $(TOP)/pthreads-snap-1999-05-30
 PTHREAD_LIBS = -L $(PTHREADS) -lpthread32
 PTHREAD_INC = -I $(PTHREADS)
 
-include $(TOP)/build/win32/make.mingw
+include ../build/win32/make.mingw
 
 ################################################################
 

diff --git a/makefile.mingw.in b/makefile.mingw.in
index 2a4ab78a9d1d30b760145a2c4c4c1f22700daa5f..62eb80acad2bbd77330e1272ec5b5e9637488564 100644 (file)
--- a/makefile.mingw.in
+++ b/makefile.mingw.in
@@ -11,7 +11,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 TOP = ..
 
-include $(TOP)/build/win32/make.mingw
+include build/win32/make.mingw
 
 ################################################################
 

diff --git a/tests/makefile.mingw.in b/tests/makefile.mingw.in
index 67638115955e0ac78be9d4628fedf394da8c898a..051c4acf8b37c8a4bf56bcce2a3d1efe3e32fb81 100644 (file)
--- a/tests/makefile.mingw.in
+++ b/tests/makefile.mingw.in
@@ -5,7 +5,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 TOP = ../..
 
-include $(TOP)/build/win32/make.mingw
+include ../build/win32/make.mingw
 
 ################################################################