2001-01-04 04:49:45 +01:00
|
|
|
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule @GLIB_DEBUG_FLAGS@
|
1999-01-03 04:42:59 +01:00
|
|
|
|
2000-10-09 18:24:57 +02:00
|
|
|
EFENCE=
|
|
|
|
|
|
2001-03-09 22:43:36 +01:00
|
|
|
libglib = $(top_builddir)/libglib-1.3.la
|
|
|
|
|
libgthread = $(top_builddir)/gthread/libgthread-1.3.la
|
|
|
|
|
libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la
|
|
|
|
|
libgobject = $(top_builddir)/gobject/libgobject-1.3.la
|
|
|
|
|
|
2001-03-10 21:03:53 +01:00
|
|
|
if PLATFORM_WIN32
|
2001-03-12 07:09:05 +01:00
|
|
|
libadd_libgmodule = $(libgmodule)
|
2001-03-10 21:03:53 +01:00
|
|
|
libadd_libglib = $(libglib)
|
|
|
|
|
no_undefined = -no-undefined
|
|
|
|
|
endif
|
|
|
|
|
|
2000-12-08 22:04:52 +01:00
|
|
|
EXTRA_DIST = \
|
|
|
|
|
$(test_scripts) \
|
2000-11-17 21:44:24 +01:00
|
|
|
makefile.msc.in \
|
2001-04-03 20:27:59 +02:00
|
|
|
makefile.mingw.in \
|
|
|
|
|
utf8.txt
|
1999-07-24 20:50:58 +02:00
|
|
|
|
2000-10-16 03:02:19 +02:00
|
|
|
BUILT_EXTRA_DIST = \
|
2001-03-09 22:43:36 +01:00
|
|
|
makefile.mingw \
|
|
|
|
|
makefile.msc
|
2000-10-16 03:02:19 +02:00
|
|
|
|
2001-05-29 16:17:23 +02:00
|
|
|
if HAVE_CXX
|
|
|
|
|
CXX_TEST = cxx-test
|
|
|
|
|
cxx_test_LDADD = $(progs_LDADD)
|
|
|
|
|
cxx_test_SOURCES = cxx-test.C
|
|
|
|
|
else
|
|
|
|
|
CXX_TEST =
|
|
|
|
|
endif
|
|
|
|
|
|
2000-12-08 22:04:52 +01:00
|
|
|
test_programs = \
|
1999-01-03 07:44:45 +01:00
|
|
|
array-test \
|
2001-05-29 16:17:23 +02:00
|
|
|
$(CXX_TEST) \
|
1999-03-15 00:46:51 +01:00
|
|
|
date-test \
|
1999-01-09 21:10:45 +01:00
|
|
|
dirname-test \
|
Finally, a new and improved IO Channel and condition watch implementation
2000-07-30 Tor Lillqvist <tml@iki.fi>
Finally, a new and improved IO Channel and condition watch
implementation for Win32. Based on code provided by Craig Setera.
When watching file descriptors, for which there is no select()
like functionality on Win32 that would work on all Win32 platforms
for all types of file descriptors (including anonymous pipes), we
start a new thread that blocks while trying to read from the file
descriptor. When the read returns, a Win32 Event is signalled that
the polling routine eventually notices. Meanwhile, the data being
read is stored in a circular buffer, from where the IO channel's
read() method picks it up.
If the buffer fills up the reading thread has to wait for space
becoming available. For this another Win32 Event is used. The IO
Channel's read() method signals this when it has read some data
out of the buffer.
The separate reader thread(s), and the circular buffer(s) with
associated events mean lots of possibilities for fun parallellism
errors. But it seems to work OK, i.e. GIMP runs.
* gmain.c: Small changes to the Win32 polling function.
(g_main_win32_get_poll_func): New function. Perhaps it would be a
good idea to provide this on all platforms.
* giowin32.c: The bulk of the new implementation.
(g_io_channel_win32_wait_for_condition): New function. To be used
where on Unix one does a select() on the channel's fd, like
libgimp's gimp_extension_process(). Could be provided on all
platforms.
* glib.h: Update documentation for IO Channels on Win32. Remove
the declarations for the as of now obsolete old functions related
to IO Channels for pipes with "wakeup" messages.
* glib.def: Some new functions.
* tests/gio-test.c: New file, to test GIOChannel and main loop.
* tests/Makefile.am
* tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
|
|
|
gio-test \
|
1999-01-03 04:42:59 +01:00
|
|
|
hash-test \
|
|
|
|
|
list-test \
|
2000-12-05 21:45:33 +01:00
|
|
|
mainloop-test \
|
Determine the suffix of the shared librarries for this system. This is
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
this system. This is done analogous to
ltconfig.sh. G_MODULE_SUFFIX in glibconfig.h is set to either
"sl", "dll", or (most often) "so".
* tests/Makefile.am, tests/module-test.c,
tests/libmoduletestplugin_a.c, tests/libmoduletestplugin_b.c:
Added new testcase for gmodule. This is mostly copied from
gmodule/testgmodule.c, but unlike that is is quiet. (Why BTW are
some tests that verbose, not to say loquacious...)
* gmodule.c: Make g_module_open more tolerant wrt to the module
name. First it tries to open the module as named, if that fails,
it checks, whether it is a libtool archive and parses it, if that
fails it appends the systems shared library suffix
(i.e. ".so") (if not already found) and tries again and if that
fails it tries to append the ".la" libtool suffix (if not already
found) and parses it.
* gmodule.c: Lock recursive mutex during most module functions for
safety.
* gmodule-dl.c: Return an error from _g_module_symbol only, if
dlerror says so. All other functions return an error as well, if
dlerror returns NULL.
* testgmodule.c: Thanks to the above change the #ifdefs have
vanished.
* glib/glib-sections.txt: Added G_MODULE_SUFFIX.
* glib/tmpl/modules.sgml: Updated.
2000-12-22 14:44:25 +01:00
|
|
|
module-test \
|
1999-01-03 04:42:59 +01:00
|
|
|
node-test \
|
1999-03-09 20:41:19 +01:00
|
|
|
queue-test \
|
1999-04-09 16:40:58 +02:00
|
|
|
rand-test \
|
1999-01-03 04:42:59 +01:00
|
|
|
relation-test \
|
2000-10-09 18:24:57 +02:00
|
|
|
shell-test \
|
1999-01-03 04:42:59 +01:00
|
|
|
slist-test \
|
2000-10-09 18:24:57 +02:00
|
|
|
spawn-test \
|
1999-01-21 19:07:20 +01:00
|
|
|
strfunc-test \
|
1999-06-18 18:36:25 +02:00
|
|
|
string-test \
|
|
|
|
|
thread-test \
|
2000-04-28 14:24:53 +02:00
|
|
|
threadpool-test \
|
1999-01-09 21:10:45 +01:00
|
|
|
tree-test \
|
2001-01-05 22:22:47 +01:00
|
|
|
type-test \
|
|
|
|
|
unicode-encoding
|
1999-01-03 04:42:59 +01:00
|
|
|
|
2000-12-08 22:04:52 +01:00
|
|
|
test_scripts = run-markup-tests.sh
|
|
|
|
|
|
|
|
|
|
test_script_support_programs = markup-test
|
|
|
|
|
|
|
|
|
|
check_PROGRAMS = $(test_programs) $(test_script_support_programs)
|
|
|
|
|
|
|
|
|
|
TESTS = $(test_programs) $(test_scripts)
|
|
|
|
|
TESTS_ENVIRONMENT = srcdir=$(srcdir)
|
1999-01-03 04:42:59 +01:00
|
|
|
|
2001-03-09 22:43:36 +01:00
|
|
|
progs_LDADD = $(EFENCE) $(libglib) $(EFENCE)
|
|
|
|
|
thread_LDADD = $(libgthread) @G_THREAD_LIBS@ $(progs_LDADD)
|
|
|
|
|
module_LDADD = $(libgmodule) @G_MODULE_LIBS@ $(progs_LDADD)
|
2000-07-14 21:22:54 +02:00
|
|
|
|
|
|
|
|
array_test_LDADD = $(progs_LDADD)
|
|
|
|
|
date_test_LDADD = $(progs_LDADD)
|
|
|
|
|
dirname_test_LDADD = $(progs_LDADD)
|
Finally, a new and improved IO Channel and condition watch implementation
2000-07-30 Tor Lillqvist <tml@iki.fi>
Finally, a new and improved IO Channel and condition watch
implementation for Win32. Based on code provided by Craig Setera.
When watching file descriptors, for which there is no select()
like functionality on Win32 that would work on all Win32 platforms
for all types of file descriptors (including anonymous pipes), we
start a new thread that blocks while trying to read from the file
descriptor. When the read returns, a Win32 Event is signalled that
the polling routine eventually notices. Meanwhile, the data being
read is stored in a circular buffer, from where the IO channel's
read() method picks it up.
If the buffer fills up the reading thread has to wait for space
becoming available. For this another Win32 Event is used. The IO
Channel's read() method signals this when it has read some data
out of the buffer.
The separate reader thread(s), and the circular buffer(s) with
associated events mean lots of possibilities for fun parallellism
errors. But it seems to work OK, i.e. GIMP runs.
* gmain.c: Small changes to the Win32 polling function.
(g_main_win32_get_poll_func): New function. Perhaps it would be a
good idea to provide this on all platforms.
* giowin32.c: The bulk of the new implementation.
(g_io_channel_win32_wait_for_condition): New function. To be used
where on Unix one does a select() on the channel's fd, like
libgimp's gimp_extension_process(). Could be provided on all
platforms.
* glib.h: Update documentation for IO Channels on Win32. Remove
the declarations for the as of now obsolete old functions related
to IO Channels for pipes with "wakeup" messages.
* glib.def: Some new functions.
* tests/gio-test.c: New file, to test GIOChannel and main loop.
* tests/Makefile.am
* tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
|
|
|
gio_test_LDADD = $(progs_LDADD)
|
2000-07-14 21:22:54 +02:00
|
|
|
hash_test_LDADD = $(progs_LDADD)
|
|
|
|
|
list_test_LDADD = $(progs_LDADD)
|
2000-12-05 21:45:33 +01:00
|
|
|
mainloop_test_LDADD = $(thread_LDADD)
|
2000-10-27 04:46:04 +02:00
|
|
|
markup_test_LDADD = $(progs_LDADD)
|
Determine the suffix of the shared librarries for this system. This is
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
this system. This is done analogous to
ltconfig.sh. G_MODULE_SUFFIX in glibconfig.h is set to either
"sl", "dll", or (most often) "so".
* tests/Makefile.am, tests/module-test.c,
tests/libmoduletestplugin_a.c, tests/libmoduletestplugin_b.c:
Added new testcase for gmodule. This is mostly copied from
gmodule/testgmodule.c, but unlike that is is quiet. (Why BTW are
some tests that verbose, not to say loquacious...)
* gmodule.c: Make g_module_open more tolerant wrt to the module
name. First it tries to open the module as named, if that fails,
it checks, whether it is a libtool archive and parses it, if that
fails it appends the systems shared library suffix
(i.e. ".so") (if not already found) and tries again and if that
fails it tries to append the ".la" libtool suffix (if not already
found) and parses it.
* gmodule.c: Lock recursive mutex during most module functions for
safety.
* gmodule-dl.c: Return an error from _g_module_symbol only, if
dlerror says so. All other functions return an error as well, if
dlerror returns NULL.
* testgmodule.c: Thanks to the above change the #ifdefs have
vanished.
* glib/glib-sections.txt: Added G_MODULE_SUFFIX.
* glib/tmpl/modules.sgml: Updated.
2000-12-22 14:44:25 +01:00
|
|
|
module_test_LDADD = $(module_LDADD)
|
|
|
|
|
module_test_LDFLAGS = @G_MODULE_LDFLAGS@
|
2000-07-14 21:22:54 +02:00
|
|
|
node_test_LDADD = $(progs_LDADD)
|
|
|
|
|
queue_test_LDADD = $(progs_LDADD)
|
|
|
|
|
rand_test_LDADD = $(progs_LDADD)
|
|
|
|
|
relation_test_LDADD = $(progs_LDADD)
|
2000-10-09 18:24:57 +02:00
|
|
|
shell_test_LDADD = $(progs_LDADD)
|
2000-07-14 21:22:54 +02:00
|
|
|
slist_test_LDADD = $(progs_LDADD)
|
2000-10-09 18:24:57 +02:00
|
|
|
spawn_test_LDADD = $(progs_LDADD)
|
2000-07-14 21:22:54 +02:00
|
|
|
strfunc_test_LDADD = $(progs_LDADD)
|
|
|
|
|
string_test_LDADD = $(progs_LDADD)
|
|
|
|
|
thread_test_LDADD = $(thread_LDADD)
|
|
|
|
|
threadpool_test_LDADD = $(thread_LDADD)
|
|
|
|
|
tree_test_LDADD = $(progs_LDADD)
|
|
|
|
|
type_test_LDADD = $(progs_LDADD)
|
2001-01-05 22:22:47 +01:00
|
|
|
unicode_encoding_LDADD = $(progs_LDADD)
|
1999-01-03 04:42:59 +01:00
|
|
|
|
Determine the suffix of the shared librarries for this system. This is
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
this system. This is done analogous to
ltconfig.sh. G_MODULE_SUFFIX in glibconfig.h is set to either
"sl", "dll", or (most often) "so".
* tests/Makefile.am, tests/module-test.c,
tests/libmoduletestplugin_a.c, tests/libmoduletestplugin_b.c:
Added new testcase for gmodule. This is mostly copied from
gmodule/testgmodule.c, but unlike that is is quiet. (Why BTW are
some tests that verbose, not to say loquacious...)
* gmodule.c: Make g_module_open more tolerant wrt to the module
name. First it tries to open the module as named, if that fails,
it checks, whether it is a libtool archive and parses it, if that
fails it appends the systems shared library suffix
(i.e. ".so") (if not already found) and tries again and if that
fails it tries to append the ".la" libtool suffix (if not already
found) and parses it.
* gmodule.c: Lock recursive mutex during most module functions for
safety.
* gmodule-dl.c: Return an error from _g_module_symbol only, if
dlerror says so. All other functions return an error as well, if
dlerror returns NULL.
* testgmodule.c: Thanks to the above change the #ifdefs have
vanished.
* glib/glib-sections.txt: Added G_MODULE_SUFFIX.
* glib/tmpl/modules.sgml: Updated.
2000-12-22 14:44:25 +01:00
|
|
|
lib_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
|
|
|
|
|
|
|
|
|
|
# Prevent those libs from being installed
|
|
|
|
|
install-libLTLIBRARIES:
|
|
|
|
|
:
|
|
|
|
|
|
|
|
|
|
libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
|
2001-03-09 22:43:36 +01:00
|
|
|
libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
|
2001-03-12 07:09:05 +01:00
|
|
|
libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
|
Determine the suffix of the shared librarries for this system. This is
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
this system. This is done analogous to
ltconfig.sh. G_MODULE_SUFFIX in glibconfig.h is set to either
"sl", "dll", or (most often) "so".
* tests/Makefile.am, tests/module-test.c,
tests/libmoduletestplugin_a.c, tests/libmoduletestplugin_b.c:
Added new testcase for gmodule. This is mostly copied from
gmodule/testgmodule.c, but unlike that is is quiet. (Why BTW are
some tests that verbose, not to say loquacious...)
* gmodule.c: Make g_module_open more tolerant wrt to the module
name. First it tries to open the module as named, if that fails,
it checks, whether it is a libtool archive and parses it, if that
fails it appends the systems shared library suffix
(i.e. ".so") (if not already found) and tries again and if that
fails it tries to append the ".la" libtool suffix (if not already
found) and parses it.
* gmodule.c: Lock recursive mutex during most module functions for
safety.
* gmodule-dl.c: Return an error from _g_module_symbol only, if
dlerror says so. All other functions return an error as well, if
dlerror returns NULL.
* testgmodule.c: Thanks to the above change the #ifdefs have
vanished.
* glib/glib-sections.txt: Added G_MODULE_SUFFIX.
* glib/tmpl/modules.sgml: Updated.
2000-12-22 14:44:25 +01:00
|
|
|
|
|
|
|
|
libmoduletestplugin_b_la_SOURCES = libmoduletestplugin_b.c
|
2001-03-09 22:43:36 +01:00
|
|
|
libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
|
2001-03-12 07:09:05 +01:00
|
|
|
libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
|
Determine the suffix of the shared librarries for this system. This is
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
this system. This is done analogous to
ltconfig.sh. G_MODULE_SUFFIX in glibconfig.h is set to either
"sl", "dll", or (most often) "so".
* tests/Makefile.am, tests/module-test.c,
tests/libmoduletestplugin_a.c, tests/libmoduletestplugin_b.c:
Added new testcase for gmodule. This is mostly copied from
gmodule/testgmodule.c, but unlike that is is quiet. (Why BTW are
some tests that verbose, not to say loquacious...)
* gmodule.c: Make g_module_open more tolerant wrt to the module
name. First it tries to open the module as named, if that fails,
it checks, whether it is a libtool archive and parses it, if that
fails it appends the systems shared library suffix
(i.e. ".so") (if not already found) and tries again and if that
fails it tries to append the ".la" libtool suffix (if not already
found) and parses it.
* gmodule.c: Lock recursive mutex during most module functions for
safety.
* gmodule-dl.c: Return an error from _g_module_symbol only, if
dlerror says so. All other functions return an error as well, if
dlerror returns NULL.
* testgmodule.c: Thanks to the above change the #ifdefs have
vanished.
* glib/glib-sections.txt: Added G_MODULE_SUFFIX.
* glib/tmpl/modules.sgml: Updated.
2000-12-22 14:44:25 +01:00
|
|
|
|
2001-03-09 22:43:36 +01:00
|
|
|
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in
|
1999-05-06 19:33:15 +02:00
|
|
|
cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
|
|
|
|
2001-03-09 22:43:36 +01:00
|
|
|
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.msc.in
|
1999-05-06 19:33:15 +02:00
|
|
|
cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
1999-06-18 18:36:25 +02:00
|
|
|
|
2000-10-16 03:02:19 +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
|
2000-11-17 21:44:24 +01:00
|
|
|
mkdir $(distdir)/markups; \
|
|
|
|
|
for f in $(srcdir)/markups/* ; do \
|
|
|
|
|
cp $$f $(distdir)/markups; \
|
2000-12-08 22:04:52 +01:00
|
|
|
done
|
