1998-06-11 01:21:14 +02:00
|
|
|
## Process this file with automake to produce Makefile.in
|
initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional
2007-11-21 21:06:47 Tim Janik <timj@imendio.com>
* Makefile.decl: initialize automake variables EXTRA_DIST and
TEST_PROGS for unconditional appending via += in other makefiles.
define recursive test targets: test, test-report, perf-report,
full-report, as described here:
http://mail.gnome.org/archives/gtk-devel-list/2007-November/msg00000.html
* Makefile.am:
* build/win32/vs8/Makefile.am, build/win32/dirent/Makefile.am:
* build/win32/Makefile.am, build/Makefile.am:
* docs/Makefile.am, docs/reference/Makefile.am:
* docs/reference/glib/Makefile.am, docs/reference/gobject/Makefile.am:
* gmodule/Makefile.am, tests/Makefile.am:
* tests/refcount/Makefile.am, tests/gobject/Makefile.am:
* glib/update-pcre/Makefile.am, glib/libcharset/Makefile.am:
* glib/tests/Makefile.am, glib/pcre/Makefile.am:
* glib/gnulib/Makefile.am, gobject/Makefile.am, m4macros/Makefile.am:
* gthread/Makefile.am, glib/Makefile.am:
include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments.
* glib/tests/Makefile.am: removed example testing rules.
* glib/tests/testing.c: conditionalized performance and slow tests.
* glib/gtestutils.h:
* glib/gtestutils.c: work around g_test_config_vars not changing its
exported value after value assignments, aparently due to symbol aliases.
* glib/gtester.c: fixed off-by-one error which produced junk in logs.
* configure.in: check for python >= 2.4 and provide $PYTHON for scripts.
svn path=/trunk/; revision=5914
2007-11-21 21:09:46 +01:00
|
|
|
include $(top_srcdir)/Makefile.decl
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2002-11-21 01:35:15 +01:00
|
|
|
if HAVE_GOOD_PRINTF
|
|
|
|
|
else
|
2003-07-29 01:00:05 +02:00
|
|
|
PRINTF_SUBDIR = gnulib
|
|
|
|
|
printf_la = gnulib/libgnulib.la
|
2002-11-21 01:35:15 +01:00
|
|
|
endif
|
|
|
|
|
|
2007-03-15 14:01:31 +01:00
|
|
|
if ENABLE_REGEX
|
|
|
|
|
if USE_SYSTEM_PCRE
|
|
|
|
|
else
|
|
|
|
|
MAYBE_PCRE = pcre
|
|
|
|
|
endif
|
|
|
|
|
gregex_c = gregex.c
|
|
|
|
|
gregex_h = gregex.h
|
|
|
|
|
else
|
|
|
|
|
gregex_c =
|
|
|
|
|
gregex_h =
|
|
|
|
|
endif
|
|
|
|
|
|
2007-11-25 23:47:39 +01:00
|
|
|
SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
|
2002-11-21 01:35:15 +01:00
|
|
|
|
2007-12-21 01:37:41 +01:00
|
|
|
DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
|
2001-09-27 04:49:05 +02:00
|
|
|
|
2007-11-25 05:22:45 +01:00
|
|
|
AM_CPPFLAGS = \
|
|
|
|
|
-I$(top_srcdir) \
|
|
|
|
|
$(pcre_inc) \
|
|
|
|
|
-DG_LOG_DOMAIN=\"GLib\" \
|
|
|
|
|
$(GLIB_DEBUG_FLAGS) \
|
|
|
|
|
-DG_DISABLE_DEPRECATED \
|
|
|
|
|
-DGLIB_COMPILATION \
|
2007-11-07 10:49:25 +01:00
|
|
|
-DPCRE_STATIC
|
version bump to 1.1.3, binary age 0, interface age 0.
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
* version bump to 1.1.3, binary age 0, interface age 0.
* glib.h: be nice to platforms that don't have gint64 and don't
issue #warning on every compilation. since glib doesn't require
gint64 itself, packages that need gint64 should test for this
themselves.
* glib.h:
* gutils.c: added a new function g_vsnprintf().
Fri Aug 14 16:41:53 1998 Tim Janik <timj@gtk.org>
* glib.h: added static inline functions for bit mask tests:
g_bit_nth_lsf, g_bit_nth_msf and g_bit_storage.
Fri Aug 13 14:23:37 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gmessages.c:
revised the message handling system, which is now based on a new
mechanism g_log*. most of the assertment macros got adapted to
feature the new g_log() call with an additional specification of
the log level in a preprocessor macro G_LOG_DOMAIN. if G_LOG_DOMAIN
is undefined upon the includion of glib.h, it'll be defined with a
value of (NULL) and thus preserves the original bahaviour for
warning and error messages. the message handler setting functions
for g_warning, g_error and g_message are only provided for backwards
compatibility and might get removed somewhen.
* Makefile.am: feature the G_LOG_DOMAIN macro to set the log domain
to "GLib" upon compilation. we currently have to add this definition
to the DEFS variable.
* testglib.c: we need an ugly #undef G_LOG_DOMAIN at the start
of this file currently, since automake doesn't support per target
_CFLAGS yet.
* glib.h: changed some gints to gbooleans, made a few const corrections,
removed some superfluous G_STMT_START{}G_STMT_END wrappers, added some
in other required places.
* gnode.c:
(g_node_prepend):
(g_node_insert_before):
(g_node_insert):
(g_node_append_data):
(g_node_prepend_data):
(g_node_insert_data_before):
(g_node_insert_data):
(g_node_append):
return (node), so these macros/functions can be usefully chained with
g_node_new().
[GModule]
Fri Aug 14 02:24:39 1998 Tim Janik <timj@gtk.org>
* Makefile.am: feature the G_LOG_DOMAIN macro to set the log domain
to "GModule" upon compilation. we currently have to add this definition
to the DEFS variable.
* testgmodule.c: we need an ugly #undef G_LOG_DOMAIN at the start
of this file currently, since automake doesn't support per target
_CFLAGS yet.
1998-08-16 23:14:11 +02:00
|
|
|
|
2004-09-16 08:05:53 +02:00
|
|
|
glib.def: glib.symbols
|
2005-03-14 05:26:57 +01:00
|
|
|
(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def
|
2004-09-16 08:05:53 +02:00
|
|
|
|
|
|
|
|
galias.h: glib.symbols
|
2004-11-29 06:42:41 +01:00
|
|
|
$(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
|
2004-09-16 08:05:53 +02:00
|
|
|
|
2005-03-14 05:26:57 +01:00
|
|
|
galiasdef.c: glib.symbols
|
|
|
|
|
$(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c
|
|
|
|
|
|
2004-12-27 07:55:08 +01:00
|
|
|
if OS_LINUX
|
2005-02-05 04:02:20 +01:00
|
|
|
if HAVE_GNUC_VISIBILITY
|
2007-08-09 00:06:47 +02:00
|
|
|
TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
|
2006-09-30 16:06:45 +02:00
|
|
|
TESTS = abicheck.sh pltcheck.sh
|
2004-09-16 08:05:53 +02:00
|
|
|
endif
|
2005-02-05 04:02:20 +01:00
|
|
|
endif
|
2004-09-16 08:05:53 +02:00
|
|
|
|
2005-03-14 05:26:57 +01:00
|
|
|
BUILT_SOURCES = galias.h galiasdef.c
|
2004-09-16 08:05:53 +02:00
|
|
|
|
2007-11-10 00:40:41 +01:00
|
|
|
MIRRORING_TAB_SOURCE = \
|
2005-11-04 23:27:04 +01:00
|
|
|
glib-mirroring-tab/Makefile \
|
|
|
|
|
glib-mirroring-tab/gen-mirroring-tab.c \
|
|
|
|
|
glib-mirroring-tab/packtab.h \
|
|
|
|
|
glib-mirroring-tab/packtab.c
|
|
|
|
|
|
2007-03-15 14:01:31 +01:00
|
|
|
# The compilation of GRegex can be disabled, but the source files must
|
|
|
|
|
# be distributed.
|
initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional
2007-11-21 21:06:47 Tim Janik <timj@imendio.com>
* Makefile.decl: initialize automake variables EXTRA_DIST and
TEST_PROGS for unconditional appending via += in other makefiles.
define recursive test targets: test, test-report, perf-report,
full-report, as described here:
http://mail.gnome.org/archives/gtk-devel-list/2007-November/msg00000.html
* Makefile.am:
* build/win32/vs8/Makefile.am, build/win32/dirent/Makefile.am:
* build/win32/Makefile.am, build/Makefile.am:
* docs/Makefile.am, docs/reference/Makefile.am:
* docs/reference/glib/Makefile.am, docs/reference/gobject/Makefile.am:
* gmodule/Makefile.am, tests/Makefile.am:
* tests/refcount/Makefile.am, tests/gobject/Makefile.am:
* glib/update-pcre/Makefile.am, glib/libcharset/Makefile.am:
* glib/tests/Makefile.am, glib/pcre/Makefile.am:
* glib/gnulib/Makefile.am, gobject/Makefile.am, m4macros/Makefile.am:
* gthread/Makefile.am, glib/Makefile.am:
include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments.
* glib/tests/Makefile.am: removed example testing rules.
* glib/tests/testing.c: conditionalized performance and slow tests.
* glib/gtestutils.h:
* glib/gtestutils.c: work around g_test_config_vars not changing its
exported value after value assignments, aparently due to symbol aliases.
* glib/gtester.c: fixed off-by-one error which produced junk in logs.
* configure.in: check for python >= 2.4 and provide $PYTHON for scripts.
svn path=/trunk/; revision=5914
2007-11-21 21:09:46 +01:00
|
|
|
EXTRA_DIST += \
|
2001-11-22 19:56:12 +01:00
|
|
|
makefile.msc.in \
|
|
|
|
|
glib.rc.in \
|
2001-07-23 13:44:04 +02:00
|
|
|
gen-unicode-tables.pl \
|
2006-10-09 06:24:29 +02:00
|
|
|
gen-script-table.pl \
|
2004-09-16 08:05:53 +02:00
|
|
|
makegalias.pl \
|
2004-09-16 16:23:18 +02:00
|
|
|
abicheck.sh \
|
2006-10-02 20:03:50 +02:00
|
|
|
pltcheck.sh \
|
2005-11-04 23:27:04 +01:00
|
|
|
glib.symbols \
|
2007-03-15 14:01:31 +01:00
|
|
|
gregex.c \
|
|
|
|
|
gregex.h \
|
2007-11-26 00:31:58 +01:00
|
|
|
win_iconv.c \
|
2007-11-10 00:40:41 +01:00
|
|
|
$(MIRRORING_TAB_SOURCE)
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
|
2001-08-30 07:09:11 +02:00
|
|
|
# These may be in the builddir too
|
|
|
|
|
BUILT_EXTRA_DIST = \
|
|
|
|
|
makefile.msc \
|
2004-09-16 08:05:53 +02:00
|
|
|
glib.rc \
|
2005-03-14 05:26:57 +01:00
|
|
|
galias.h \
|
|
|
|
|
galiasdef.c
|
2001-08-30 07:09:11 +02:00
|
|
|
|
2002-03-05 06:18:23 +01:00
|
|
|
lib_LTLIBRARIES = libglib-2.0.la
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2008-04-21 10:38:36 +02:00
|
|
|
if OS_WIN32_AND_DLL_COMPILATION
|
More Win32 automake macros. For .def files: GLIB_DEF, GMODULE_DEF,
2001-09-25 Tor Lillqvist <tml@iki.fi>
* configure.in: More Win32 automake macros. For .def files:
GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
files: TESTGMODULE_EXP (for programs that need to export symbols,
just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
test whether the Microsoft librarian ("ar") is available to build
MS import libraries.
* glib/Makefile.am
* gmodule/Makefile.am: Use above. New rule to build MS import
library.
* glib/makefile.msc.in
* tests/makefile.msc.in
* tests/makefile.mingw.in: Use same DLL and import library names as
libtool.
gmodule:
2001-09-25 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in: Fix missing end @ in @LT_CURRENT@.
* makefile.msc.in: Use same DLL and import library names as
libtool.
gobject:
2001-09-25 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Use new macros for .def file, and check for
MS_LIB_AVAILABLE, new rule to build MS import library.
* makefile.msc.in: Use same DLL and import library names as
libtool.
gthread:
2001-09-25 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Use new macros for .def file, and check for
MS_LIB_AVAILABLE, new rule to build MS import library.
* makefile.msc.in: Use same DLL and import library names as
libtool.
2001-09-25 08:03:23 +02:00
|
|
|
if MS_LIB_AVAILABLE
|
2002-03-05 06:18:23 +01:00
|
|
|
noinst_DATA = glib-2.0.lib
|
2001-10-23 00:14:26 +02:00
|
|
|
|
2008-04-21 10:38:36 +02:00
|
|
|
install_ms_lib_cmd = $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir)
|
|
|
|
|
uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/glib-2.0.lib
|
|
|
|
|
endif
|
|
|
|
|
endif
|
2001-10-23 00:14:26 +02:00
|
|
|
|
|
|
|
|
install-ms-lib:
|
2008-04-21 10:38:36 +02:00
|
|
|
$(install_ms_lib_cmd)
|
|
|
|
|
|
2001-10-23 00:14:26 +02:00
|
|
|
uninstall-ms-lib:
|
2008-04-21 10:38:36 +02:00
|
|
|
$(uninstall_ms_lib_cmd)
|
More Win32 automake macros. For .def files: GLIB_DEF, GMODULE_DEF,
2001-09-25 Tor Lillqvist <tml@iki.fi>
* configure.in: More Win32 automake macros. For .def files:
GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
files: TESTGMODULE_EXP (for programs that need to export symbols,
just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
test whether the Microsoft librarian ("ar") is available to build
MS import libraries.
* glib/Makefile.am
* gmodule/Makefile.am: Use above. New rule to build MS import
library.
* glib/makefile.msc.in
* tests/makefile.msc.in
* tests/makefile.mingw.in: Use same DLL and import library names as
libtool.
gmodule:
2001-09-25 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in: Fix missing end @ in @LT_CURRENT@.
* makefile.msc.in: Use same DLL and import library names as
libtool.
gobject:
2001-09-25 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Use new macros for .def file, and check for
MS_LIB_AVAILABLE, new rule to build MS import library.
* makefile.msc.in: Use same DLL and import library names as
libtool.
gthread:
2001-09-25 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Use new macros for .def file, and check for
MS_LIB_AVAILABLE, new rule to build MS import library.
* makefile.msc.in: Use same DLL and import library names as
libtool.
2001-09-25 08:03:23 +02:00
|
|
|
|
2002-03-05 06:18:23 +01:00
|
|
|
libglib_2_0_la_SOURCES = \
|
2000-06-29 04:53:12 +02:00
|
|
|
garray.c \
|
|
|
|
|
gasyncqueue.c \
|
2004-02-26 15:30:35 +01:00
|
|
|
gatomic.c \
|
2000-07-12 23:06:16 +02:00
|
|
|
gbacktrace.c \
|
2006-04-04 15:03:23 +02:00
|
|
|
gbase64.c \
|
2006-03-27 20:22:47 +02:00
|
|
|
gbookmarkfile.c \
|
2001-09-08 20:23:04 +02:00
|
|
|
gbsearcharray.h \
|
2000-06-29 04:53:12 +02:00
|
|
|
gcache.c \
|
2007-12-04 17:31:51 +01:00
|
|
|
gchecksum.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gcompletion.c \
|
2000-09-11 05:03:18 +02:00
|
|
|
gconvert.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gdataset.c \
|
2005-05-05 16:57:29 +02:00
|
|
|
gdatasetprivate.h \
|
2000-06-29 04:53:12 +02:00
|
|
|
gdate.c \
|
2001-11-05 02:47:31 +01:00
|
|
|
gdir.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gerror.c \
|
2000-10-09 18:24:57 +02:00
|
|
|
gfileutils.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
ghash.c \
|
|
|
|
|
ghook.c \
|
|
|
|
|
giochannel.c \
|
2004-10-23 08:16:42 +02:00
|
|
|
gkeyfile.c \
|
2001-01-17 05:31:20 +01:00
|
|
|
glibintl.h \
|
2000-06-29 04:53:12 +02:00
|
|
|
glist.c \
|
|
|
|
|
gmain.c \
|
2005-06-25 05:38:32 +02:00
|
|
|
gmappedfile.c \
|
2000-10-27 04:46:04 +02:00
|
|
|
gmarkup.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gmem.c \
|
|
|
|
|
gmessages.c \
|
2005-11-04 23:27:04 +01:00
|
|
|
gmirroringtable.h \
|
2000-06-29 04:53:12 +02:00
|
|
|
gnode.c \
|
2004-08-02 23:40:40 +02:00
|
|
|
goption.c \
|
2001-04-03 15:15:41 +02:00
|
|
|
gpattern.c \
|
2008-09-23 18:32:30 +02:00
|
|
|
gpoll.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gprimes.c \
|
2000-11-21 00:59:32 +01:00
|
|
|
gqsort.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gqueue.c \
|
|
|
|
|
grel.c \
|
|
|
|
|
grand.c \
|
2007-03-15 14:01:31 +01:00
|
|
|
$(gregex_c) \
|
2000-06-29 04:53:12 +02:00
|
|
|
gscanner.c \
|
2006-10-09 06:24:29 +02:00
|
|
|
gscripttable.h \
|
2007-02-04 00:24:50 +01:00
|
|
|
gsequence.c \
|
2000-10-09 18:24:57 +02:00
|
|
|
gshell.c \
|
2005-12-01 17:34:33 +01:00
|
|
|
gslice.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gslist.c \
|
2004-10-27 18:46:29 +02:00
|
|
|
gstdio.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gstrfuncs.c \
|
|
|
|
|
gstring.c \
|
2007-11-25 23:47:39 +01:00
|
|
|
gtestutils.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gthread.c \
|
Renamed to glib/gthreadprivate.h and moved system thread identifier
2006-05-09 Sebastian Wilhelmi <wilhelmi@google.com>
* glib/gthreadinit.h: Renamed to glib/gthreadprivate.h and moved
system thread identifier comparision and assignment macros from
glib/gthread.c to glib/gthreadprivate.h.
* glib/Makefile.am, glib/gatomic.c, glib/gconvert.c, glib/gmain.c,
glib/gmem.c, glib/gmessages.c, glib/grand.c, glib/gslice.c,
glib/gthread.c, glib/gutils.c, gthread/gthread-impl.c: Use
glib/gthreadprivate.h instead of glib/gthreadinit.h.
* gthread/gthread-impl.c: Use GSystemThread instead of GThread for
owner determination. This fixes #311043 and is mostly modeled
after the patch from jylefort@FreeBSD.org.
2006-05-10 02:44:50 +02:00
|
|
|
gthreadprivate.h \
|
2000-06-29 04:53:12 +02:00
|
|
|
gthreadpool.c \
|
|
|
|
|
gtimer.c \
|
|
|
|
|
gtree.c \
|
|
|
|
|
guniprop.c \
|
|
|
|
|
gutf8.c \
|
2000-11-30 00:38:24 +01:00
|
|
|
gunibreak.h \
|
|
|
|
|
gunibreak.c \
|
2000-06-29 04:53:12 +02:00
|
|
|
gunichartables.h \
|
2001-07-02 02:49:21 +02:00
|
|
|
gunicollate.c \
|
2001-07-11 17:28:35 +02:00
|
|
|
gunicomp.h \
|
2000-06-29 04:53:12 +02:00
|
|
|
gunidecomp.h \
|
|
|
|
|
gunidecomp.c \
|
2003-10-24 00:42:31 +02:00
|
|
|
gunicodeprivate.h \
|
2007-11-27 15:57:45 +01:00
|
|
|
gurifuncs.c \
|
2002-02-22 00:07:34 +01:00
|
|
|
gutils.c \
|
2002-11-21 01:35:15 +01:00
|
|
|
gdebug.h \
|
|
|
|
|
gprintf.c \
|
2008-05-20 15:03:15 +02:00
|
|
|
gprintfint.h
|
2000-10-16 03:02:19 +02:00
|
|
|
|
2002-03-05 06:18:23 +01:00
|
|
|
EXTRA_libglib_2_0_la_SOURCES = \
|
2001-03-09 22:18:33 +01:00
|
|
|
giounix.c \
|
|
|
|
|
giowin32.c \
|
|
|
|
|
gspawn.c \
|
|
|
|
|
gspawn-win32.c \
|
|
|
|
|
gwin32.c
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2000-07-14 21:22:54 +02:00
|
|
|
glibincludedir=$(includedir)/glib-2.0
|
|
|
|
|
glibinclude_HEADERS = \
|
2001-06-26 18:01:21 +02:00
|
|
|
glib-object.h \
|
|
|
|
|
glib.h
|
|
|
|
|
|
|
|
|
|
glibsubincludedir=$(includedir)/glib-2.0/glib
|
|
|
|
|
glibsubinclude_HEADERS = \
|
2000-10-12 14:16:16 +02:00
|
|
|
galloca.h \
|
|
|
|
|
garray.h \
|
|
|
|
|
gasyncqueue.h \
|
2004-02-26 15:30:35 +01:00
|
|
|
gatomic.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
gbacktrace.h \
|
2006-04-04 15:03:23 +02:00
|
|
|
gbase64.h \
|
2006-03-27 20:22:47 +02:00
|
|
|
gbookmarkfile.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
gcache.h \
|
2007-12-04 17:31:51 +01:00
|
|
|
gchecksum.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
gcompletion.h \
|
|
|
|
|
gconvert.h \
|
|
|
|
|
gdataset.h \
|
|
|
|
|
gdate.h \
|
2001-11-05 02:47:31 +01:00
|
|
|
gdir.h \
|
2000-07-14 21:22:54 +02:00
|
|
|
gerror.h \
|
2000-10-09 18:24:57 +02:00
|
|
|
gfileutils.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
ghash.h \
|
|
|
|
|
ghook.h \
|
2003-11-05 22:07:47 +01:00
|
|
|
gi18n.h \
|
|
|
|
|
gi18n-lib.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
giochannel.h \
|
2004-10-23 08:16:42 +02:00
|
|
|
gkeyfile.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
glist.h \
|
|
|
|
|
gmacros.h \
|
|
|
|
|
gmain.h \
|
2005-06-25 05:38:32 +02:00
|
|
|
gmappedfile.h \
|
2000-10-27 04:46:04 +02:00
|
|
|
gmarkup.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
gmem.h \
|
|
|
|
|
gmessages.h \
|
|
|
|
|
gnode.h \
|
2004-08-02 23:40:40 +02:00
|
|
|
goption.h \
|
2001-04-03 15:15:41 +02:00
|
|
|
gpattern.h \
|
2008-09-23 18:32:30 +02:00
|
|
|
gpoll.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
gprimes.h \
|
2000-11-21 00:59:32 +01:00
|
|
|
gqsort.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
gquark.h \
|
|
|
|
|
gqueue.h \
|
|
|
|
|
grand.h \
|
2007-03-15 14:01:31 +01:00
|
|
|
$(gregex_h) \
|
2000-10-12 14:16:16 +02:00
|
|
|
grel.h \
|
|
|
|
|
gscanner.h \
|
2007-02-04 00:24:50 +01:00
|
|
|
gsequence.h \
|
2000-10-09 18:24:57 +02:00
|
|
|
gshell.h \
|
2005-12-01 17:34:33 +01:00
|
|
|
gslice.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
gslist.h \
|
2000-10-09 18:24:57 +02:00
|
|
|
gspawn.h \
|
2004-10-27 18:46:29 +02:00
|
|
|
gstdio.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
gstrfuncs.h \
|
2007-11-25 22:47:16 +01:00
|
|
|
gtestutils.h \
|
2000-10-12 14:16:16 +02:00
|
|
|
gstring.h \
|
|
|
|
|
gthread.h \
|
|
|
|
|
gthreadpool.h \
|
|
|
|
|
gtimer.h \
|
|
|
|
|
gtree.h \
|
|
|
|
|
gtypes.h \
|
|
|
|
|
gunicode.h \
|
2007-11-27 15:57:45 +01:00
|
|
|
gurifuncs.h \
|
2000-10-19 19:52:12 +02:00
|
|
|
gutils.h \
|
2002-11-21 01:35:15 +01:00
|
|
|
gwin32.h \
|
|
|
|
|
gprintf.h
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2005-06-26 20:04:08 +02:00
|
|
|
install-data-local: install-ms-lib install-def-file
|
2001-06-26 18:01:21 +02:00
|
|
|
@if test -f $(glibincludedir)/glist.h ; then \
|
|
|
|
|
echo "*** Old headers found in $(glibincludedir). You should remove the" ; \
|
|
|
|
|
echo "*** contents of this directory and type 'make install' again." ; \
|
|
|
|
|
false ; \
|
|
|
|
|
fi
|
1998-11-01 02:32:59 +01:00
|
|
|
|
2005-06-26 20:04:08 +02:00
|
|
|
uninstall-local: uninstall-ms-lib uninstall-def-file
|
2001-10-23 00:14:26 +02:00
|
|
|
|
2001-03-09 22:18:33 +01:00
|
|
|
if PLATFORM_WIN32
|
|
|
|
|
no_undefined = -no-undefined
|
|
|
|
|
endif
|
2001-11-06 07:38:36 +01:00
|
|
|
|
2008-04-21 10:38:36 +02:00
|
|
|
if OS_WIN32_AND_DLL_COMPILATION
|
2005-01-06 18:18:12 +01:00
|
|
|
export_symbols = -export-symbols glib.def
|
2008-04-21 10:38:36 +02:00
|
|
|
|
|
|
|
|
glib_win32_res = glib-win32-res.o
|
|
|
|
|
glib_win32_res_ldflag = -Wl,$(glib_win32_res)
|
|
|
|
|
|
2008-03-16 11:16:57 +01:00
|
|
|
glib_def = glib.def
|
2001-10-23 00:14:26 +02:00
|
|
|
|
2005-06-26 20:04:08 +02:00
|
|
|
install-def-file:
|
2005-01-06 18:18:12 +01:00
|
|
|
$(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
|
2003-01-04 07:47:14 +01:00
|
|
|
|
2005-06-26 20:04:08 +02:00
|
|
|
uninstall-def-file:
|
|
|
|
|
-rm $(DESTDIR)$(libdir)/glib-2.0.def
|
2001-10-23 00:14:26 +02:00
|
|
|
else
|
2005-06-26 20:04:08 +02:00
|
|
|
install-def-file:
|
|
|
|
|
uninstall-def-file:
|
2004-09-16 08:05:53 +02:00
|
|
|
|
|
|
|
|
export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
|
2001-03-09 22:18:33 +01:00
|
|
|
endif
|
2000-11-13 00:44:28 +01:00
|
|
|
|
2007-03-15 14:01:31 +01:00
|
|
|
if ENABLE_REGEX
|
|
|
|
|
if USE_SYSTEM_PCRE
|
|
|
|
|
pcre_lib = $(PCRE_LIBS)
|
2007-09-11 22:10:31 +02:00
|
|
|
pcre_inc = $(PCRE_CFLAGS)
|
2007-03-15 14:01:31 +01:00
|
|
|
else
|
|
|
|
|
pcre_lib = pcre/libpcre.la
|
2007-09-11 22:10:31 +02:00
|
|
|
pcre_inc =
|
2007-03-15 14:01:31 +01:00
|
|
|
endif
|
|
|
|
|
else
|
|
|
|
|
pcre_lib =
|
2007-09-11 22:10:31 +02:00
|
|
|
pcre_inc =
|
2007-03-15 14:01:31 +01:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)
|
2008-03-16 11:16:57 +01:00
|
|
|
libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
|
2001-09-17 02:41:39 +02:00
|
|
|
|
2002-03-05 06:18:23 +01:00
|
|
|
libglib_2_0_la_LDFLAGS = \
|
2005-07-09 01:04:06 +02:00
|
|
|
$(glib_win32_res_ldflag) \
|
1999-01-02 03:40:39 +01:00
|
|
|
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
2001-03-09 22:18:33 +01:00
|
|
|
-export-dynamic $(no_undefined) $(export_symbols)
|
|
|
|
|
|
2007-11-20 16:00:40 +01:00
|
|
|
INSTALL_PROGS=
|
|
|
|
|
|
2007-12-20 16:50:08 +01:00
|
|
|
gspawn-win32-helper-console.c:
|
2008-05-18 23:38:50 +02:00
|
|
|
echo '#define HELPER_CONSOLE' >$@
|
|
|
|
|
echo '#include "gspawn-win32-helper.c"' >>$@
|
2007-12-20 16:50:08 +01:00
|
|
|
|
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated
2008-07-28 Tor Lillqvist <tml@novell.com>
Fix problems on 64-bit Windows. Avoid warnings, some of which
indicated actual problems, some which were just annoyances.
Where casts to an integer type are needed for pointers, use
gssize. Technically intptr_t would be the more proper type, but we
still want to be compilable with MSVS6 and 7 which don't have
intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not
<stdint.h>.
Use %p to print out handles. Use gssize casts when assigning
GPollFD::fd fields.
Use G_GSIZE_FORMAT when printing size_t values.
* configure.in: Define automake conditional G_OS_WIN32_X64 which
is true on Win64.
* glib/giochannel.h: Use slightly different prototype for
g_io_channel_win32_new_messages() on Win64 with gsize instead of
guint.
* glib/giowin32.c
* glib/gmain.c
* glib/gspawn-win32.c
* tests/testglib.c: Generic changes as described above.
* glib/gmain.h: Don't bother mentioning GIMP in comment.
* glib/grel.c (tuple_hash_2): Use all bits of pointer.
* glib/gspawn-win32.c
* glib/gspawn-win32-helper.c: Use gssize types in the
communication between parent and helper process, so that we can
pass process handles, which are pointers, also on Win64.
* glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on
Win64 so we can't pass the address of a GTimeVal::tv_sec which is
a long directly to gmtime(). On the other hand, changing
GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible
either, as that would then require changes in much code that uses
GTimeVals.
* glib/gspawn-win32.c
* glib/Makefile.am: Call the helper programs
gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on
Win64, to avoid potential risk of running a 32-bit version of the
helper.
svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
|
|
|
gspawn-win64-helper.c:
|
|
|
|
|
echo '#include "gspawn-win32-helper.c"' >$@
|
|
|
|
|
|
|
|
|
|
gspawn-win64-helper-console.c:
|
|
|
|
|
echo '#define HELPER_CONSOLE' >$@
|
|
|
|
|
echo '#include "gspawn-win32-helper.c"' >>$@
|
|
|
|
|
|
2001-03-09 22:18:33 +01:00
|
|
|
if OS_WIN32
|
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated
2008-07-28 Tor Lillqvist <tml@novell.com>
Fix problems on 64-bit Windows. Avoid warnings, some of which
indicated actual problems, some which were just annoyances.
Where casts to an integer type are needed for pointers, use
gssize. Technically intptr_t would be the more proper type, but we
still want to be compilable with MSVS6 and 7 which don't have
intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not
<stdint.h>.
Use %p to print out handles. Use gssize casts when assigning
GPollFD::fd fields.
Use G_GSIZE_FORMAT when printing size_t values.
* configure.in: Define automake conditional G_OS_WIN32_X64 which
is true on Win64.
* glib/giochannel.h: Use slightly different prototype for
g_io_channel_win32_new_messages() on Win64 with gsize instead of
guint.
* glib/giowin32.c
* glib/gmain.c
* glib/gspawn-win32.c
* tests/testglib.c: Generic changes as described above.
* glib/gmain.h: Don't bother mentioning GIMP in comment.
* glib/grel.c (tuple_hash_2): Use all bits of pointer.
* glib/gspawn-win32.c
* glib/gspawn-win32-helper.c: Use gssize types in the
communication between parent and helper process, so that we can
pass process handles, which are pointers, also on Win64.
* glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on
Win64 so we can't pass the address of a GTimeVal::tv_sec which is
a long directly to gmtime(). On the other hand, changing
GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible
either, as that would then require changes in much code that uses
GTimeVals.
* glib/gspawn-win32.c
* glib/Makefile.am: Call the helper programs
gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on
Win64, to avoid potential risk of running a 32-bit version of the
helper.
svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
|
|
|
if OS_WIN32_X64
|
|
|
|
|
INSTALL_PROGS += gspawn-win64-helper gspawn-win64-helper-console
|
|
|
|
|
gspawn_win64_helper_LDADD = libglib-2.0.la
|
|
|
|
|
gspawn_win64_helper_LDFLAGS = -mwindows
|
|
|
|
|
gspawn_win64_helper_console_LDADD = libglib-2.0.la
|
|
|
|
|
else
|
2007-11-20 16:00:40 +01:00
|
|
|
INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console
|
2002-03-05 06:18:23 +01:00
|
|
|
gspawn_win32_helper_LDADD = libglib-2.0.la
|
2001-11-06 07:38:36 +01:00
|
|
|
gspawn_win32_helper_LDFLAGS = -mwindows
|
2005-09-07 12:10:49 +02:00
|
|
|
gspawn_win32_helper_console_LDADD = libglib-2.0.la
|
2008-04-21 10:38:36 +02:00
|
|
|
endif
|
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated
2008-07-28 Tor Lillqvist <tml@novell.com>
Fix problems on 64-bit Windows. Avoid warnings, some of which
indicated actual problems, some which were just annoyances.
Where casts to an integer type are needed for pointers, use
gssize. Technically intptr_t would be the more proper type, but we
still want to be compilable with MSVS6 and 7 which don't have
intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not
<stdint.h>.
Use %p to print out handles. Use gssize casts when assigning
GPollFD::fd fields.
Use G_GSIZE_FORMAT when printing size_t values.
* configure.in: Define automake conditional G_OS_WIN32_X64 which
is true on Win64.
* glib/giochannel.h: Use slightly different prototype for
g_io_channel_win32_new_messages() on Win64 with gsize instead of
guint.
* glib/giowin32.c
* glib/gmain.c
* glib/gspawn-win32.c
* tests/testglib.c: Generic changes as described above.
* glib/gmain.h: Don't bother mentioning GIMP in comment.
* glib/grel.c (tuple_hash_2): Use all bits of pointer.
* glib/gspawn-win32.c
* glib/gspawn-win32-helper.c: Use gssize types in the
communication between parent and helper process, so that we can
pass process handles, which are pointers, also on Win64.
* glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on
Win64 so we can't pass the address of a GTimeVal::tv_sec which is
a long directly to gmtime(). On the other hand, changing
GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible
either, as that would then require changes in much code that uses
GTimeVals.
* glib/gspawn-win32.c
* glib/Makefile.am: Call the helper programs
gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on
Win64, to avoid potential risk of running a 32-bit version of the
helper.
svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
|
|
|
endif
|
2001-09-17 02:41:39 +02:00
|
|
|
|
2005-07-09 01:04:06 +02:00
|
|
|
glib-win32-res.o: glib.rc
|
|
|
|
|
$(WINDRES) glib.rc $@
|
1999-02-21 19:58:59 +01:00
|
|
|
|
2007-11-20 16:00:40 +01:00
|
|
|
bin_PROGRAMS = ${INSTALL_PROGS}
|
|
|
|
|
|
2007-11-25 22:39:42 +01:00
|
|
|
if OS_UNIX
|
|
|
|
|
|
2007-11-20 16:00:40 +01:00
|
|
|
INSTALL_PROGS += gtester
|
|
|
|
|
gtester_SOURCES = gtester.c
|
2008-05-27 18:00:51 +02:00
|
|
|
gtester_LDADD = libglib-2.0.la
|
2007-11-20 16:00:40 +01:00
|
|
|
|
2007-12-20 15:01:26 +01:00
|
|
|
auto_config_binscripts = gtester-report
|
|
|
|
|
bin_SCRIPTS = ${auto_config_binscripts}
|
|
|
|
|
EXTRA_DIST += ${auto_config_binscripts}
|
|
|
|
|
|
|
|
|
|
CONFIGVARS = \
|
|
|
|
|
"bindir" : "${bindir}", \
|
|
|
|
|
"glib-version" : "${GLIB_VERSION}"
|
|
|
|
|
|
|
|
|
|
install-exec-hook:
|
|
|
|
|
for sf in ${auto_config_binscripts} ; do \
|
2008-01-11 09:01:44 +01:00
|
|
|
mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \
|
|
|
|
|
&& sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \
|
2007-12-21 18:02:29 +01:00
|
|
|
-e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@| ${CONFIGVARS}|' \
|
2008-09-26 16:28:25 +02:00
|
|
|
-e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
|
2008-01-11 09:01:44 +01:00
|
|
|
|| exit $$? ; \
|
|
|
|
|
rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
|
2007-12-20 15:01:26 +01:00
|
|
|
done
|
|
|
|
|
|
2007-11-25 22:39:42 +01:00
|
|
|
endif
|
2005-09-07 12:10:49 +02:00
|
|
|
|
2002-03-05 06:18:23 +01:00
|
|
|
glib-2.0.lib: libglib-2.0.la glib.def
|
2008-07-27 17:54:15 +02:00
|
|
|
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@
|
2001-09-17 02:41:39 +02:00
|
|
|
|
|
|
|
|
dist-hook: $(BUILT_EXTRA_DIST)
|
|
|
|
|
files='$(BUILT_EXTRA_DIST)'; \
|
|
|
|
|
for f in $$files; do \
|
|
|
|
|
if test -f $$f; then d=.; else d=$(srcdir); fi; \
|
|
|
|
|
cp $$d/$$f $(distdir) || exit 1; done
|
