From 45adcf12c156ee7c8074d57c30262e809a05a1e1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 14 Jul 2000 22:46:35 +0000 Subject: [PATCH] Include the "build" module in GLib, too, to make it more self-contained. 2000-07-15 Tor Lillqvist * 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. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-12 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ Makefile.am | 2 +- glib/Makefile.am | 2 +- glib/makefile.mingw.in | 2 +- gmodule/makefile.mingw.in | 2 +- gobject/makefile.mingw.in | 2 +- gthread/makefile.mingw.in | 2 +- makefile.mingw.in | 2 +- tests/makefile.mingw.in | 2 +- 16 files changed, 80 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdb39d61f..6a4ad4370 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2000-07-15 Tor Lillqvist + + * 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 * Release 1.3.1 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bdb39d61f..6a4ad4370 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2000-07-15 Tor Lillqvist + + * 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 * Release 1.3.1 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bdb39d61f..6a4ad4370 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2000-07-15 Tor Lillqvist + + * 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 * Release 1.3.1 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index bdb39d61f..6a4ad4370 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,12 @@ +2000-07-15 Tor Lillqvist + + * 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 * Release 1.3.1 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bdb39d61f..6a4ad4370 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2000-07-15 Tor Lillqvist + + * 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 * Release 1.3.1 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bdb39d61f..6a4ad4370 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2000-07-15 Tor Lillqvist + + * 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 * Release 1.3.1 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bdb39d61f..6a4ad4370 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2000-07-15 Tor Lillqvist + + * 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 * Release 1.3.1 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bdb39d61f..6a4ad4370 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2000-07-15 Tor Lillqvist + + * 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 * Release 1.3.1 diff --git a/Makefile.am b/Makefile.am index 8014870b0..ea0bce5ee 100644 --- 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 8014870b0..ea0bce5ee 100644 --- 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 2a4ab78a9..62eb80aca 100644 --- 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 2c9c9034a..6ae721404 100644 --- 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 47ab9cb8c..fd6db1791 100644 --- 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 47e7863bf..d0739dd87 100644 --- 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 2a4ab78a9..62eb80aca 100644 --- 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 676381159..051c4acf8 100644 --- 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 ################################################################