Include make.msc from GLib's build subdir.

2000-12-01  Tor Lillqvist  <tml@iki.fi>

	* {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir.

	* makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak.

	* glib.def: Update correspondingly.

diff --git a/ChangeLog b/ChangeLog
index 72f049d4255ad895cc80a17516f7ea0dfdca244f..41e6843f5fa906f2e21c4b6458787693ae1a9b5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-01  Tor Lillqvist  <tml@iki.fi>
+
+       * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir.
+
+       * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak.
+
+       * glib.def: Update correspondingly.
+
 2000-11-21  Havoc Pennington  <hp@pobox.com>
 
        * gmacros.h: Provide G_CONST_RETURN which is 'const' by default,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 72f049d4255ad895cc80a17516f7ea0dfdca244f..41e6843f5fa906f2e21c4b6458787693ae1a9b5e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2000-12-01  Tor Lillqvist  <tml@iki.fi>
+
+       * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir.
+
+       * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak.
+
+       * glib.def: Update correspondingly.
+
 2000-11-21  Havoc Pennington  <hp@pobox.com>
 
        * gmacros.h: Provide G_CONST_RETURN which is 'const' by default,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 72f049d4255ad895cc80a17516f7ea0dfdca244f..41e6843f5fa906f2e21c4b6458787693ae1a9b5e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2000-12-01  Tor Lillqvist  <tml@iki.fi>
+
+       * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir.
+
+       * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak.
+
+       * glib.def: Update correspondingly.
+
 2000-11-21  Havoc Pennington  <hp@pobox.com>
 
        * gmacros.h: Provide G_CONST_RETURN which is 'const' by default,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 72f049d4255ad895cc80a17516f7ea0dfdca244f..41e6843f5fa906f2e21c4b6458787693ae1a9b5e 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2000-12-01  Tor Lillqvist  <tml@iki.fi>
+
+       * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir.
+
+       * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak.
+
+       * glib.def: Update correspondingly.
+
 2000-11-21  Havoc Pennington  <hp@pobox.com>
 
        * gmacros.h: Provide G_CONST_RETURN which is 'const' by default,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 72f049d4255ad895cc80a17516f7ea0dfdca244f..41e6843f5fa906f2e21c4b6458787693ae1a9b5e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2000-12-01  Tor Lillqvist  <tml@iki.fi>
+
+       * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir.
+
+       * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak.
+
+       * glib.def: Update correspondingly.
+
 2000-11-21  Havoc Pennington  <hp@pobox.com>
 
        * gmacros.h: Provide G_CONST_RETURN which is 'const' by default,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 72f049d4255ad895cc80a17516f7ea0dfdca244f..41e6843f5fa906f2e21c4b6458787693ae1a9b5e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2000-12-01  Tor Lillqvist  <tml@iki.fi>
+
+       * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir.
+
+       * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak.
+
+       * glib.def: Update correspondingly.
+
 2000-11-21  Havoc Pennington  <hp@pobox.com>
 
        * gmacros.h: Provide G_CONST_RETURN which is 'const' by default,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 72f049d4255ad895cc80a17516f7ea0dfdca244f..41e6843f5fa906f2e21c4b6458787693ae1a9b5e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2000-12-01  Tor Lillqvist  <tml@iki.fi>
+
+       * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir.
+
+       * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak.
+
+       * glib.def: Update correspondingly.
+
 2000-11-21  Havoc Pennington  <hp@pobox.com>
 
        * gmacros.h: Provide G_CONST_RETURN which is 'const' by default,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 72f049d4255ad895cc80a17516f7ea0dfdca244f..41e6843f5fa906f2e21c4b6458787693ae1a9b5e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2000-12-01  Tor Lillqvist  <tml@iki.fi>
+
+       * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir.
+
+       * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak.
+
+       * glib.def: Update correspondingly.
+
 2000-11-21  Havoc Pennington  <hp@pobox.com>
 
        * gmacros.h: Provide G_CONST_RETURN which is 'const' by default,

diff --git a/glib.def b/glib.def
index b76636866a081b6e106dbb1fe8aad67427863035..f6a2ae01a07e3da13cf2254308df922d64c44a22 100644 (file)
--- a/glib.def
+++ b/glib.def
@@ -508,6 +508,7 @@ EXPORTS
        g_tuples_destroy
        g_tuples_index
        g_ucs4_to_utf8
+       g_unichar_break_type
        g_unichar_digit_value
        g_unichar_isalnum
        g_unichar_isalpha

diff --git a/glib/glib.def b/glib/glib.def
index b76636866a081b6e106dbb1fe8aad67427863035..f6a2ae01a07e3da13cf2254308df922d64c44a22 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -508,6 +508,7 @@ EXPORTS
        g_tuples_destroy
        g_tuples_index
        g_ucs4_to_utf8
+       g_unichar_break_type
        g_unichar_digit_value
        g_unichar_isalnum
        g_unichar_isalpha

diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in
index d691228310c20fb7cd3fc5987063ff6fb402f61a..c8ff215618a392866e172ad6e4ce3838d643f4db 100644 (file)
--- a/glib/makefile.mingw.in
+++ b/glib/makefile.mingw.in
@@ -76,6 +76,7 @@ glib_OBJECTS =                        \
        gthreadpool.o           \
        gtimer.o                \
        gtree.o                 \
+       gunibreak.o             \
        gunidecomp.o            \
        guniprop.o              \
        gutf8.o                 \

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index f67422e281bacbe206c52fff006f1c195c61e022..7eaac1f572a93a89e4d688afac8559aa2e96c446 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -7,7 +7,7 @@ BIN = C:\bin
 
 TOP = ..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE build\win32\make.msc
 
 # Possibly override GLib version in build\win32\module.defs
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
@@ -74,6 +74,7 @@ glib_OBJECTS =                        \
        gthreadpool.obj         \
        gtimer.obj              \
        gtree.obj               \
+       gunibreak.obj           \
        gunidecomp.obj          \
        guniprop.obj            \
        gutf8.obj               \

diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in
index c9bfb17b22cd85c08e75c3996df8b46898fc74a0..7bd97de7f06ab390ac3e47d55f89632758b0a37d 100644 (file)
--- a/gmodule/makefile.msc.in
+++ b/gmodule/makefile.msc.in
@@ -3,7 +3,7 @@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE ..\build\win32\make.msc
 
 # Possibly override GLib version in build\win32\module.defs
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@

diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index db24b23dc94aff038c083289fef0175d2016d052..ce8ce8e4608f888b5990d566ddde54b2bf949e6f 100644 (file)
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -3,7 +3,7 @@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE ..\build\win32\make.msc
 
 # Possibly override GLib version in build\win32\object.defs
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@

diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in
index c000036d54d588813e2f500d5fc044bd470d083f..5450af009271583cb9864d3bdee313ddc67979b4 100644 (file)
--- a/gthread/makefile.msc.in
+++ b/gthread/makefile.msc.in
@@ -5,7 +5,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE ..\build\win32\make.msc
 
 # Possibly override GLib version in build\win32\module.defs
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@

diff --git a/makefile.mingw.in b/makefile.mingw.in
index d691228310c20fb7cd3fc5987063ff6fb402f61a..c8ff215618a392866e172ad6e4ce3838d643f4db 100644 (file)
--- a/makefile.mingw.in
+++ b/makefile.mingw.in
@@ -76,6 +76,7 @@ glib_OBJECTS =                        \
        gthreadpool.o           \
        gtimer.o                \
        gtree.o                 \
+       gunibreak.o             \
        gunidecomp.o            \
        guniprop.o              \
        gutf8.o                 \

diff --git a/makefile.msc.in b/makefile.msc.in
index f67422e281bacbe206c52fff006f1c195c61e022..7eaac1f572a93a89e4d688afac8559aa2e96c446 100644 (file)
--- a/makefile.msc.in
+++ b/makefile.msc.in
@@ -7,7 +7,7 @@ BIN = C:\bin
 
 TOP = ..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE build\win32\make.msc
 
 # Possibly override GLib version in build\win32\module.defs
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
@@ -74,6 +74,7 @@ glib_OBJECTS =                        \
        gthreadpool.obj         \
        gtimer.obj              \
        gtree.obj               \
+       gunibreak.obj           \
        gunidecomp.obj          \
        guniprop.obj            \
        gutf8.obj               \

diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in
index 8d90366210dd41705167ecfa0f71de3878f99d54..8ecda3555c6a2d0bd46c919ba346e48c82b85365 100644 (file)
--- a/tests/makefile.msc.in
+++ b/tests/makefile.msc.in
@@ -3,7 +3,7 @@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE ..\build\win32\make.msc
 
 # Possibly override GLib version in build\win32\module.defs
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@