luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
1565a2027e
glib/gthread/Makefile.am

92 lines
2.5 KiB
Makefile
Raw Normal View History

This commit merges the glib-threads branch into the main branch. See the ChangeLog for details of the changes. In brief overview: - The set of threading functions can be set - A default implementation is provided in -lgthread - All static data structures are locked using these functions if g_thread_init() is called.
1998-12-15 06:28:02 +01:00
## Process this file with automake to produce Makefile.in
Move glib library into a subdirectory, make all GLib include files include Tue Jun 26 11:43:46 2001 Owen Taylor <otaylor@redhat.com> * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am: Move glib library into a subdirectory, make all GLib include files include as <glib/glist.h> * tests/testglib.c tests/testgdate.c tests/testgdateparser.c tests/timeloop.c tests/timeloop-basic.c: Move all tests into the tests/ subdirectory.
2001-06-26 18:01:21 +02:00
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \
Add @GLIB_DEBUG_FLAGS@ to INCLUDES for accessing -DG_ENABLE_DEBUG as 2000-10-25 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * Makefile.am : Add @GLIB_DEBUG_FLAGS@ to INCLUDES for accessing -DG_ENABLE_DEBUG as needed in gthread-posix.c. * gthread-posix.c: Revamped error handling for native thread function calls. Now EPERM errors are ignored for some commands and only a warning message is output once (at first occurrence).
2000-10-25 12:58:46 +02:00
-DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@ \
@GLIB_DEBUG_FLAGS@
This commit merges the glib-threads branch into the main branch. See the ChangeLog for details of the changes. In brief overview: - The set of threading functions can be set - A default implementation is provided in -lgthread - All static data structures are locked using these functions if g_thread_init() is called.
1998-12-15 06:28:02 +01:00
updated. 1998-12-15 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * Makefile.am (EXTRA_DIST): updated. * testgthread.c, gthread-*.c: Changed private to private_key to avoid problems when compiling with under C++.
1998-12-15 18:49:30 +01:00
EXTRA_DIST = \
makefile.mingw.in tests/makefile.mingw.in Rename makefile.cygwin(.in) to 2000-05-13 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in * tests/makefile.mingw.in * build-dll: Rename makefile.cygwin(.in) to makefile.mingw(.in), which better describes what it is. Move the build of gmodule, gthread and gobject DLLs to makefiles in those directories. Move resource file handling and build number bump to build-dll, where it sits much cleaner. * README.win32 * Makefile.am (EXTRA_DIST): Update accordingly. * glib.h: Add G_PI, G_PI_2, G_PI_4, G_E, G_LN2, G_LN10 and G_SQRT2. M_PI etc aren't necessarily in <math.h> in strict ISO C implementations. * glib.def: Add g_strcanon. * gtree.c (g_tree_node_rotate_left): Remove unused variables. * gwin32.c (g_win32_opendir): Remove unneeded statement. gmodule: * makefile.mingw.in: New file, with gmodule stuff moved from ../makefile.mingw.in. * Makefile.am: Add to EXTRA_DIST, and add rule to make makefile.mingw. gobject: * makefile.mingw.in * gobject.def * gobject.rc.in: New files, for Win32 (mingw) build. * Makefile.am: Add to EXTRA_DIST. Add rules to produce the corresponding non-*.in files. * gtype.h: (Win32:) Mark _g_type_fundamental_last for export/import from DLL. gthread: * makefile.mingw.in: New file, with gthread stuff moved from ../makefile.mingw.in. * Makefile.am: Add to EXTRA_DIST, add rule to build makefile.mingw.
2000-05-13 21:30:58 +02:00
makefile.mingw.in \
Revamp to be like makefile.mingw.in, make the MSVC build actually work 2000-10-06 Tor Lillqvist <tml@iki.fi> * makefile.msc.in: Revamp to be like makefile.mingw.in, make the MSVC build actually work again. * gmodule/makefile.msc.in * gobject/makefile.msc.in * gthread/makefile.msc.in: New files, like their mingw counterparts. * gmodule/Makefile.am * gobject/Makefile.am * gthread/Makefile.am: Make and distribute them. * */makefile.mingw.in: Allow override of GLib version number from the build/win32/module.defs file. * glib.def: Add new entry point. Fixes from Hans Breuer: * glib.h (struct DIR): Keep the last readdir result cached inside the DIR struct, to enable several DIRs being open simultaneously. * gwin32.c (g_win32_readdir): Use the above instead of static. * giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep MSVC happy.
2000-10-06 23:32:59 +02:00
makefile.msc.in \
updated. 1998-12-15 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * Makefile.am (EXTRA_DIST): updated. * testgthread.c, gthread-*.c: Changed private to private_key to avoid problems when compiling with under C++.
1998-12-15 18:49:30 +01:00
gthread-posix.c \
gthread-solaris.c \
Removed POSIX_*. Defined G_THREAD_SOURCE to "gthread-win32.c". 2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * config.h.win32.in: Removed POSIX_*. Defined G_THREAD_SOURCE to "gthread-win32.c". * glibconfig.h.win32.in: Define G_HAVE_ISO_VARARGS for gcc, don't know about MSC. Define G_THREADS_IMPL_WIN32 instead of G_THREADS_IMPL_POSIX and define the right static mutex macros and types. * build/win32/make.mingw (CXX): Removed PTHREAD defs. Added -O2 -Wall to compile flags. * gthread/gthread-impl.c (g_thread_init): Move the thread implementation initialization to before assigning GThreadFuncs, which now is just struct assigned and not memcpy'ed. Completed check for zero members of GThreadFuncs. * gthread/makefile.mingw: Don't link to pthread anymore. * gthread/gthread-win32.c: New file for native thread support for win32. Thanks to Hans Breuer <hans@breuer.org> to got me kickstarted. * gthread/Makefile.am: Also distribute gthread-win32.c.
2001-05-22 14:28:06 +02:00
gthread-win32.c \
More Win32 updates. Add missing Win32 files to distributed files. Remove the obsolete makefile.lcc.
1999-01-19 22:13:59 +01:00
gthread-none.c \
Move to corresponding subdirectories. 2000-02-07 Tor Lillqvist <tml@iki.fi> * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories. * Makefile.am * gmodule/Makefile.am * gthread/Makefile.am: Change accordingly. * makefile.cygwin: Corresponding changes, some cleanup.
2000-02-07 22:22:30 +01:00
gthread.def \
Added various win32 related *.in files to EXTRA_DIST to let 'make 2000-03-24 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am, tests/Makefile.am: Added various win32 related *.in files to EXTRA_DIST to let 'make distcheck' procude all the corresponding files, which it silently fails to do currently.
2000-03-24 13:56:56 +01:00
gthread.rc.in
This commit merges the glib-threads branch into the main branch. See the ChangeLog for details of the changes. In brief overview: - The set of threading functions can be set - A default implementation is provided in -lgthread - All static data structures are locked using these functions if g_thread_init() is called.
1998-12-15 06:28:02 +01:00
gmodule: New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST). gmodule: * Makefile.am (BUILT_EXTRA_DIST): New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST). gobject: * Makefile.am (BUILT_EXTRA_DIST): New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST). (*): Remove traces of @STRIP_{BEGIN,END}@. gthread: * Makefile.am (BUILT_EXTRA_DIST): New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST). docs/reference: 'make distcheck' fixes. * glib/Makefile.am (EXTRA_DIST): Add $(DOC_MODULE)-decl.txt. (html): Run 'gtkdoc-fixxref' in $(srcdir). (dist-check-gtkdoc): Add missing quote. (dist-hook): Copy in dependency order, so that none of the makerules are fired in a tarball build. * gobject/Makefile.am: Likewise. toplevel: Remove need for acconfig.h, and misc. cleanups. * acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to AC_DEFINE_UNQUOTED. (GLIB_BYTE_CONTENTS): Likewise. * configure.in: Add 'autoheader' comments to all AC_DEFINE(...) and AC_DEFINE_UNQUOTED(...) lines. Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK. (AM_PROG_LIBTOOL): Move after AC_PROG_CC. * acconfig.h: Empty out. * Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able files that are created in the builddir. (dist-hook): Handle those files. (libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only be used in an _LDADD or _LIBADD, since it expands (if necessary) to 'alloca.o'. * tests/Makefile.am (BUILT_EXTRA_DIST): New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-10-16 03:02:19 +02:00
BUILT_EXTRA_DIST = \
makefile.mingw \
makefile.msc \
gthread.rc
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
libglib = $(top_builddir)/glib/libglib-2.0.la
This commit merges the glib-threads branch into the main branch. See the ChangeLog for details of the changes. In brief overview: - The set of threading functions can be set - A default implementation is provided in -lgthread - All static data structures are locked using these functions if g_thread_init() is called.
1998-12-15 06:28:02 +01:00
Port to BeOS by myself and Richard Offer. Sat May 8 01:52:29 CDT 1999 Shawn T. Amundson <amundson@gtk.org> * configure.in gerror.c gmain.c gstrfuncs.c gutils.c ltconfig ltmain.sh gmodule/Makefile.am gmodule/gmodule.c gmodule/gmoduleconf.h.in gmodule/gmodule-beos.c gthread/Makefile.am: Port to BeOS by myself and Richard Offer.
1999-05-08 09:40:44 +02:00
top_builddir_full=`cd \$(top_builddir); pwd`
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
lib_LTLIBRARIES = libgthread-2.0.la
This commit merges the glib-threads branch into the main branch. See the ChangeLog for details of the changes. In brief overview: - The set of threading functions can be set - A default implementation is provided in -lgthread - All static data structures are locked using these functions if g_thread_init() is called.
1998-12-15 06:28:02 +01:00
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
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
noinst_DATA = gthread-2.0.lib
If we have built the MSVC import library, install it. Install the gcc 2001-10-23 Tor Lillqvist <tml@iki.fi> * {glib,gmodule,gobject,gthread}/Makefile.am: (Win32): If we have built the MSVC import library, install it. Install the gcc import library. Also support uninstall.
2001-10-23 00:14:26 +02:00
install-ms-lib:
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
$(INSTALL) gthread-2.0.lib $(DESTDIR)$(libdir)
If we have built the MSVC import library, install it. Install the gcc 2001-10-23 Tor Lillqvist <tml@iki.fi> * {glib,gmodule,gobject,gthread}/Makefile.am: (Win32): If we have built the MSVC import library, install it. Install the gcc import library. Also support uninstall.
2001-10-23 00:14:26 +02:00
uninstall-ms-lib:
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
-rm $(DESTDIR)$(libdir)/gthread-2.0.lib
If we have built the MSVC import library, install it. Install the gcc 2001-10-23 Tor Lillqvist <tml@iki.fi> * {glib,gmodule,gobject,gthread}/Makefile.am: (Win32): If we have built the MSVC import library, install it. Install the gcc import library. Also support uninstall.
2001-10-23 00:14:26 +02:00
else
install-ms-lib:
uninstall-ms-lib:
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
endif
Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined 2001-02-21 Tor Lillqvist <tml@iki.fi> * Makefile.am: Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined for Win32 and Cygwin. * gthread-impl.c (g_thread_init): Win32 code snippet used also on Cygwin.
2001-03-09 22:41:37 +01:00
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
If we have built the MSVC import library, install it. Install the gcc 2001-10-23 Tor Lillqvist <tml@iki.fi> * {glib,gmodule,gobject,gthread}/Makefile.am: (Win32): If we have built the MSVC import library, install it. Install the gcc import library. Also support uninstall.
2001-10-23 00:14:26 +02:00
Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined 2001-02-21 Tor Lillqvist <tml@iki.fi> * Makefile.am: Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined for Win32 and Cygwin. * gthread-impl.c (g_thread_init): Win32 code snippet used also on Cygwin.
2001-03-09 22:41:37 +01:00
if OS_WIN32
export_symbols = -export-symbols gthread.def
If we have built the MSVC import library, install it. Install the gcc 2001-10-23 Tor Lillqvist <tml@iki.fi> * {glib,gmodule,gobject,gthread}/Makefile.am: (Win32): If we have built the MSVC import library, install it. Install the gcc import library. Also support uninstall.
2001-10-23 00:14:26 +02:00
install-libtool-import-lib:
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
$(INSTALL) .libs/libgthread-2.0.dll.a $(DESTDIR)$(libdir)
If we have built the MSVC import library, install it. Install the gcc 2001-10-23 Tor Lillqvist <tml@iki.fi> * {glib,gmodule,gobject,gthread}/Makefile.am: (Win32): If we have built the MSVC import library, install it. Install the gcc import library. Also support uninstall.
2001-10-23 00:14:26 +02:00
uninstall-libtool-import-lib:
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
-rm $(DESTDIR)$(libdir)/libgthread-2.0.dll.a
If we have built the MSVC import library, install it. Install the gcc 2001-10-23 Tor Lillqvist <tml@iki.fi> * {glib,gmodule,gobject,gthread}/Makefile.am: (Win32): If we have built the MSVC import library, install it. Install the gcc import library. Also support uninstall.
2001-10-23 00:14:26 +02:00
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined 2001-02-21 Tor Lillqvist <tml@iki.fi> * Makefile.am: Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined for Win32 and Cygwin. * gthread-impl.c (g_thread_init): Win32 code snippet used also on Cygwin.
2001-03-09 22:41:37 +01:00
endif
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
libgthread_2_0_la_SOURCES = gthread-impl.c
libgthread_2_0_la_LDFLAGS = \
This commit merges the glib-threads branch into the main branch. See the ChangeLog for details of the changes. In brief overview: - The set of threading functions can be set - A default implementation is provided in -lgthread - All static data structures are locked using these functions if g_thread_init() is called.
1998-12-15 06:28:02 +01:00
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined 2001-02-21 Tor Lillqvist <tml@iki.fi> * Makefile.am: Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined for Win32 and Cygwin. * gthread-impl.c (g_thread_init): Win32 code snippet used also on Cygwin.
2001-03-09 22:41:37 +01:00
-export-dynamic $(no_undefined) $(export_symbols)
This commit merges the glib-threads branch into the main branch. See the ChangeLog for details of the changes. In brief overview: - The set of threading functions can be set - A default implementation is provided in -lgthread - All static data structures are locked using these functions if g_thread_init() is called.
1998-12-15 06:28:02 +01:00
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
libgthread_2_0_la_LIBADD = @G_THREAD_WIN32_RESOURCE@ @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib)
Add variable for LT_CURRENT minus LT_AGE (the suffix used by libtool on 2001-09-17 Tor Lillqvist <tml@iki.fi> * configure.in: Add variable for LT_CURRENT minus LT_AGE (the suffix used by libtool on Win32 for DLLs). Set variables for the compiled resource files on Windows. Handle the native Win32 gthread stuff. * glib/Makefile.am * gmodule/Makefile.am * gobject/Makefile.am: (Win32) Add minor hacks to link in the object file produced from the resource file. Use the lt-compile-resource script from the build module. The non-hack way would be to teach libtool, autoconf and automake about .rc files (which are a kind of source code, after all, that gets compiled to object files). But then there would be problems for those who wouldn't have bleeding edge auto* and libtool. * glib/glib.def * gobject/gobject.def: Updates. * glib/glib.rc.in * gmodule/gmodule.rc.in * gobject/gobject.rc.in * gthread/gthread.rc.in: Update InternalName and OriginalFilename to match libtool's naming convention for DLLs. * glib/gutils.c: Ditto when constructing the DLL name in the definition for GLIB_LOCALE_DIR. * glib/makefile.mingw.in * gmodule/makefile.mingw.in * gobject/makefile.mingw.in * gthread/makefile.mingw.in: Update import library names.
2001-09-17 02:41:39 +02:00
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
libgthread_2_0_la_DEPENDENCIES = @G_THREAD_WIN32_RESOURCE@ @GTHREAD_DEF@
Add variable for LT_CURRENT minus LT_AGE (the suffix used by libtool on 2001-09-17 Tor Lillqvist <tml@iki.fi> * configure.in: Add variable for LT_CURRENT minus LT_AGE (the suffix used by libtool on Win32 for DLLs). Set variables for the compiled resource files on Windows. Handle the native Win32 gthread stuff. * glib/Makefile.am * gmodule/Makefile.am * gobject/Makefile.am: (Win32) Add minor hacks to link in the object file produced from the resource file. Use the lt-compile-resource script from the build module. The non-hack way would be to teach libtool, autoconf and automake about .rc files (which are a kind of source code, after all, that gets compiled to object files). But then there would be problems for those who wouldn't have bleeding edge auto* and libtool. * glib/glib.def * gobject/gobject.def: Updates. * glib/glib.rc.in * gmodule/gmodule.rc.in * gobject/gobject.rc.in * gthread/gthread.rc.in: Update InternalName and OriginalFilename to match libtool's naming convention for DLLs. * glib/gutils.c: Ditto when constructing the DLL name in the definition for GLIB_LOCALE_DIR. * glib/makefile.mingw.in * gmodule/makefile.mingw.in * gobject/makefile.mingw.in * gthread/makefile.mingw.in: Update import library names.
2001-09-17 02:41:39 +02:00
if OS_WIN32
@G_THREAD_WIN32_RESOURCE@ : gthread.rc
$(top_srcdir)/build/win32/lt-compile-resource gthread.rc @G_THREAD_WIN32_RESOURCE@
endif
Move to corresponding subdirectories. 2000-02-07 Tor Lillqvist <tml@iki.fi> * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories. * Makefile.am * gmodule/Makefile.am * gthread/Makefile.am: Change accordingly. * makefile.cygwin: Corresponding changes, some cleanup.
2000-02-07 22:22:30 +01:00
Default to --disable-gtk-doc, to avoid Jade setup hassles. Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Default to --disable-gtk-doc, to avoid Jade setup hassles. * autogen.sh: Add --enable-gtk-doc. * configure.in: Default to --disable-static to go along with Pango, GTK+ where we need to do that for bin-compat reasons. * Makefile.am: Add a slightly modified distcheck rule that passes --enable-gtk-doc to the configure inside. (So that 'make dist' succeeds inside.) * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4 tests/makefile.mingw.in: Switch everything over to glib-2.0.
2002-03-05 06:18:23 +01:00
gthread-2.0.lib: libgthread-2.0.la gthread.def
lib -name:libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:gthread.def -out:$@
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
Move to corresponding subdirectories. 2000-02-07 Tor Lillqvist <tml@iki.fi> * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories. * Makefile.am * gmodule/Makefile.am * gthread/Makefile.am: Change accordingly. * makefile.cygwin: Corresponding changes, some cleanup.
2000-02-07 22:22:30 +01:00
gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
Added various win32 related *.in files to EXTRA_DIST to let 'make 2000-03-24 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am, tests/Makefile.am: Added various win32 related *.in files to EXTRA_DIST to let 'make distcheck' procude all the corresponding files, which it silently fails to do currently.
2000-03-24 13:56:56 +01:00
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Move to corresponding subdirectories. 2000-02-07 Tor Lillqvist <tml@iki.fi> * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories. * Makefile.am * gmodule/Makefile.am * gthread/Makefile.am: Change accordingly. * makefile.cygwin: Corresponding changes, some cleanup.
2000-02-07 22:22:30 +01:00
makefile.mingw.in tests/makefile.mingw.in Rename makefile.cygwin(.in) to 2000-05-13 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in * tests/makefile.mingw.in * build-dll: Rename makefile.cygwin(.in) to makefile.mingw(.in), which better describes what it is. Move the build of gmodule, gthread and gobject DLLs to makefiles in those directories. Move resource file handling and build number bump to build-dll, where it sits much cleaner. * README.win32 * Makefile.am (EXTRA_DIST): Update accordingly. * glib.h: Add G_PI, G_PI_2, G_PI_4, G_E, G_LN2, G_LN10 and G_SQRT2. M_PI etc aren't necessarily in <math.h> in strict ISO C implementations. * glib.def: Add g_strcanon. * gtree.c (g_tree_node_rotate_left): Remove unused variables. * gwin32.c (g_win32_opendir): Remove unneeded statement. gmodule: * makefile.mingw.in: New file, with gmodule stuff moved from ../makefile.mingw.in. * Makefile.am: Add to EXTRA_DIST, and add rule to make makefile.mingw. gobject: * makefile.mingw.in * gobject.def * gobject.rc.in: New files, for Win32 (mingw) build. * Makefile.am: Add to EXTRA_DIST. Add rules to produce the corresponding non-*.in files. * gtype.h: (Win32:) Mark _g_type_fundamental_last for export/import from DLL. gthread: * makefile.mingw.in: New file, with gthread stuff moved from ../makefile.mingw.in. * Makefile.am: Add to EXTRA_DIST, add rule to build makefile.mingw.
2000-05-13 21:30:58 +02:00
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Revamp to be like makefile.mingw.in, make the MSVC build actually work 2000-10-06 Tor Lillqvist <tml@iki.fi> * makefile.msc.in: Revamp to be like makefile.mingw.in, make the MSVC build actually work again. * gmodule/makefile.msc.in * gobject/makefile.msc.in * gthread/makefile.msc.in: New files, like their mingw counterparts. * gmodule/Makefile.am * gobject/Makefile.am * gthread/Makefile.am: Make and distribute them. * */makefile.mingw.in: Allow override of GLib version number from the build/win32/module.defs file. * glib.def: Add new entry point. Fixes from Hans Breuer: * glib.h (struct DIR): Keep the last readdir result cached inside the DIR struct, to enable several DIRs being open simultaneously. * gwin32.c (g_win32_readdir): Use the above instead of static. * giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep MSVC happy.
2000-10-06 23:32:59 +02:00
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.msc.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
gmodule: New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST). gmodule: * Makefile.am (BUILT_EXTRA_DIST): New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST). gobject: * Makefile.am (BUILT_EXTRA_DIST): New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST). (*): Remove traces of @STRIP_{BEGIN,END}@. gthread: * Makefile.am (BUILT_EXTRA_DIST): New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST). docs/reference: 'make distcheck' fixes. * glib/Makefile.am (EXTRA_DIST): Add $(DOC_MODULE)-decl.txt. (html): Run 'gtkdoc-fixxref' in $(srcdir). (dist-check-gtkdoc): Add missing quote. (dist-hook): Copy in dependency order, so that none of the makerules are fired in a tarball build. * gobject/Makefile.am: Likewise. toplevel: Remove need for acconfig.h, and misc. cleanups. * acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to AC_DEFINE_UNQUOTED. (GLIB_BYTE_CONTENTS): Likewise. * configure.in: Add 'autoheader' comments to all AC_DEFINE(...) and AC_DEFINE_UNQUOTED(...) lines. Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK. (AM_PROG_LIBTOOL): Move after AC_PROG_CC. * acconfig.h: Empty out. * Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able files that are created in the builddir. (dist-hook): Handle those files. (libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only be used in an _LDADD or _LIBADD, since it expands (if necessary) to 'alloca.o'. * tests/Makefile.am (BUILT_EXTRA_DIST): New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST).
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
If we have built the MSVC import library, install it. Install the gcc 2001-10-23 Tor Lillqvist <tml@iki.fi> * {glib,gmodule,gobject,gthread}/Makefile.am: (Win32): If we have built the MSVC import library, install it. Install the gcc import library. Also support uninstall.
2001-10-23 00:14:26 +02:00
install-data-local: install-ms-lib install-libtool-import-lib
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
Reference in New Issue Copy Permalink