summaryrefslogtreecommitdiff
path: root/build_shared
diff options
context:
space:
mode:
authorDaniel Elstner <daniel@src.gnome.org>2007-08-12 21:09:00 +0000
committerDaniel Elstner <daniel@src.gnome.org>2007-08-12 21:09:00 +0000
commit132b0ceb8c30ef82a6c11635eff8e7b41feba357 (patch)
tree544411b77209837210bc68cba9c00e8617d4f30d /build_shared
parente915ec4b7e60652c080e907f87d7b0c02026b5d4 (diff)
downloadglibmm-132b0ceb8c30ef82a6c11635eff8e7b41feba357.tar.gz
Add -I$(top_builddir) in order to allow <config.h> to be included.
* build_shared/Makefile_build.am_fragment (all_includes): Add -I$(top_builddir) in order to allow <config.h> to be included. * glib/glibmm/ustring.{cc,h}: Include <config.h> for the definition of SIZEOF_WCHAR_T. (ustring::FormatStream::stream): Replace accessor with template method that passes its argument onto the stream. Add overload for "const char*" to enable the use of UTF-8 string literals as arguments to ustring::format(). (ustring::FormatStream::FormatStream): Handle exceptions on failure to initialize the locale gracefully. (ustring::format): Adapt to the modified stream() method. (operator<<): Add missing call to ustring::raw() to get the number of bytes instead of code points. Oops. svn path=/trunk/; revision=433
Diffstat (limited to 'build_shared')
-rw-r--r--build_shared/Makefile_build.am_fragment2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_shared/Makefile_build.am_fragment b/build_shared/Makefile_build.am_fragment
index 95a39412..7a8bef44 100644
--- a/build_shared/Makefile_build.am_fragment
+++ b/build_shared/Makefile_build.am_fragment
@@ -41,7 +41,7 @@ endif
common_ldflags = -version-info $(LIBGLIBMM_SO_VERSION) $(no_undefined)
-all_includes = -I$(top_builddir)/glib -I$(top_srcdir)/glib \
+all_includes = -I$(top_builddir)/glib -I$(top_srcdir)/glib -I$(top_builddir) \
$(sublib_cflags) $(GTHREAD_CFLAGS)
extra_defines = -DG_LOG_DOMAIN=\"$(sublib_name)\" $(extra_win32_defines) \