luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 17:26:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
9763367246
glib/gthread/Makefile.am

88 lines
2.0 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@ \
add -DG_DISABLED_DEPRECATED Tue Oct 15 15:07:45 2002 Manish Singh <yosh@gimp.org> * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am: add -DG_DISABLED_DEPRECATED * tests/gio-test.c tests/mainloop-test.c tests/string-test.c tests/testglib.c test/tree-test.c tests/unicode-collate.c tests/unicode-normalize.c: Deprecation cleanup
2002-10-16 00:16:57 +02:00
@GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
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 = \
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 \
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.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
glib/Makefile.am gmodule/Makefile.am gobject/Makefile.am Use srcdir also 2003-08-13 Tor Lillqvist <tml@iki.fi> * glib/Makefile.am * gmodule/Makefile.am * gobject/Makefile.am * gthread/Makefile.am: Use srcdir also in references to the .def files. (#118885, Jeff Bonggren)
2003-08-13 02:24:21 +02:00
export_symbols = -export-symbols $(srcdir)/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
libtool installs/uninstalls the import library, no need to do it 2005-06-26 Tor Lillqvist <tml@novell.com> * Makefile.am: libtool installs/uninstalls the import library, no need to do it ourselves. Do still install/uninstall the .def file, though.
2005-06-26 20:07:13 +02:00
install-def-file:
glib/Makefile.am gmodule/Makefile.am gobject/Makefile.am Use srcdir also 2003-08-13 Tor Lillqvist <tml@iki.fi> * glib/Makefile.am * gmodule/Makefile.am * gobject/Makefile.am * gthread/Makefile.am: Use srcdir also in references to the .def files. (#118885, Jeff Bonggren)
2003-08-13 02:24:21 +02:00
$(INSTALL) $(srcdir)/gthread.def $(DESTDIR)$(libdir)/gthread-2.0.def
[Win32] Install also the .def files, to help users generate import 2003-01-04 Tor Lillqvist <tml@iki.fi> * {glib,gmodule,gobject,gthread}/Makefile.am: [Win32] Install also the .def files, to help users generate import libraries for other compilers. Uninstall, too. * glib-zip.in: Include .def files from above.
2003-01-04 07:47:14 +01:00
libtool installs/uninstalls the import library, no need to do it 2005-06-26 Tor Lillqvist <tml@novell.com> * Makefile.am: libtool installs/uninstalls the import library, no need to do it ourselves. Do still install/uninstall the .def file, though.
2005-06-26 20:07:13 +02:00
uninstall-def-file:
-rm $(DESTDIR)$(libdir)/gthread-2.0.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
else
libtool installs/uninstalls the import library, no need to do it 2005-06-26 Tor Lillqvist <tml@novell.com> * Makefile.am: libtool installs/uninstalls the import library, no need to do it ourselves. Do still install/uninstall the .def file, though.
2005-06-26 20:07:13 +02:00
install-def-file:
uninstall-def-file:
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
Don't use autoconf variables for the resource object files on Win32 any 2005-07-09 Tor Lillqvist <tml@novell.com> * configure.in: Don't use autoconf variables for the resource object files on Win32 any longer. Instead handle that in the Makefile.am files. Check for windres. * glibconfig.h.win32.in: Minor tuning to match the configure-produced glibconfig.h closely. * */Makefile.am: Don't use the scripts in build/win32 to compile the .rc file into a resource object file. (This means we loose the build number increment magic, but I doubt it was that useful anyway.) Instead use windres directly. To pass the normal .o file produced by windres through libtool, which wants .lo files, pass it directly to the linker using a -Wl option. * */*.rc.in: Thus replace BUILDNUMBER with 0.
2005-07-09 01:04:06 +02:00
if OS_WIN32
gthread_win32_res = gthread-win32-res.o
gthread_win32_res_ldflag = -Wl,$(gthread_win32_res)
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 = \
Don't use autoconf variables for the resource object files on Win32 any 2005-07-09 Tor Lillqvist <tml@novell.com> * configure.in: Don't use autoconf variables for the resource object files on Win32 any longer. Instead handle that in the Makefile.am files. Check for windres. * glibconfig.h.win32.in: Minor tuning to match the configure-produced glibconfig.h closely. * */Makefile.am: Don't use the scripts in build/win32 to compile the .rc file into a resource object file. (This means we loose the build number increment magic, but I doubt it was that useful anyway.) Instead use windres directly. To pass the normal .o file produced by windres through libtool, which wants .lo files, pass it directly to the linker using a -Wl option. * */*.rc.in: Thus replace BUILDNUMBER with 0.
2005-07-09 01:04:06 +02:00
$(gthread_win32_res_ldflag) \
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
Don't use autoconf variables for the resource object files on Win32 any 2005-07-09 Tor Lillqvist <tml@novell.com> * configure.in: Don't use autoconf variables for the resource object files on Win32 any longer. Instead handle that in the Makefile.am files. Check for windres. * glibconfig.h.win32.in: Minor tuning to match the configure-produced glibconfig.h closely. * */Makefile.am: Don't use the scripts in build/win32 to compile the .rc file into a resource object file. (This means we loose the build number increment magic, but I doubt it was that useful anyway.) Instead use windres directly. To pass the normal .o file produced by windres through libtool, which wants .lo files, pass it directly to the linker using a -Wl option. * */*.rc.in: Thus replace BUILDNUMBER with 0.
2005-07-09 01:04:06 +02:00
libgthread_2_0_la_LIBADD = $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(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
Don't use autoconf variables for the resource object files on Win32 any 2005-07-09 Tor Lillqvist <tml@novell.com> * configure.in: Don't use autoconf variables for the resource object files on Win32 any longer. Instead handle that in the Makefile.am files. Check for windres. * glibconfig.h.win32.in: Minor tuning to match the configure-produced glibconfig.h closely. * */Makefile.am: Don't use the scripts in build/win32 to compile the .rc file into a resource object file. (This means we loose the build number increment magic, but I doubt it was that useful anyway.) Instead use windres directly. To pass the normal .o file produced by windres through libtool, which wants .lo files, pass it directly to the linker using a -Wl option. * */*.rc.in: Thus replace BUILDNUMBER with 0.
2005-07-09 01:04:06 +02:00
libgthread_2_0_la_DEPENDENCIES = $(gthread_win32_res) $(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
Don't use autoconf variables for the resource object files on Win32 any 2005-07-09 Tor Lillqvist <tml@novell.com> * configure.in: Don't use autoconf variables for the resource object files on Win32 any longer. Instead handle that in the Makefile.am files. Check for windres. * glibconfig.h.win32.in: Minor tuning to match the configure-produced glibconfig.h closely. * */Makefile.am: Don't use the scripts in build/win32 to compile the .rc file into a resource object file. (This means we loose the build number increment magic, but I doubt it was that useful anyway.) Instead use windres directly. To pass the normal .o file produced by windres through libtool, which wants .lo files, pass it directly to the linker using a -Wl option. * */*.rc.in: Thus replace BUILDNUMBER with 0.
2005-07-09 01:04:06 +02:00
gthread-win32-res.o: gthread.rc
$(WINDRES) gthread.rc $@
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
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
require automake 1.7. Add calls to libtoolize and gtkdocize. Clean up some 2003-03-01 James Henstridge <james@daa.com.au> * autogen.sh: require automake 1.7. Add calls to libtoolize and gtkdocize. Clean up some of the error messages. * configure.in: move version declaration to the top of the file (before AC_INIT), using M4 macros. GLIB_AC_DIVERT_BEFORE_HELP() calls no longer necessary, due to use of M4 macro expansion in help messages instead. Convert AC_ARG_WITH/AC_ARG_ENABLE calls to use AC_HELP_STRING to format help strings. Use quadrigraphs to get square brackets to show correctly. Replace gtk-doc checks with a call to GTK_DOC_CHECK() macro. Use AC_CONFIG_COMMANDS([glibconfig.h], ...) to output glibconfig.h, so that "./config.status glibconfig.h" works. Add an extra AC_CONFIG_FILES call listing other files we want generated by config.status protected by an "if false" block. This way automake generates the rules needed to rebuild the files for us. Add quotes in various places. * docs/reference/*/Makefile.am: convert to use the common gtk-doc.make file. This localises the complexity to a single makefile fragment maintained with gtk-doc itself. * */Makefile.am: remove unneeded rules to build win32 files with config.status. Automake now does this for us. Replace instances of @FOO@ with $(FOO) where appropriate -- this allows automake to do a better job checking the makefile. Add some files to DISTCLEANFILES where appropriate * Makefile.am: use the DISTCHECK_CONFIGURE_FLAGS variable to ensure that --enable-gtk-doc is passed to configure during a distcheck. Remove the custom distcheck, since the standard one will now do. * gobject/Makefile.am: switch to BUILT_SOURCES, since that now works.
2003-03-04 11:10:48 +01:00
lib -name:libgthread-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gthread.def -out:$@
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
libtool installs/uninstalls the import library, no need to do it 2005-06-26 Tor Lillqvist <tml@novell.com> * Makefile.am: libtool installs/uninstalls the import library, no need to do it ourselves. Do still install/uninstall the .def file, though.
2005-06-26 20:07:13 +02:00
install-data-local: install-ms-lib install-def-file
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
libtool installs/uninstalls the import library, no need to do it 2005-06-26 Tor Lillqvist <tml@novell.com> * Makefile.am: libtool installs/uninstalls the import library, no need to do it ourselves. Do still install/uninstall the .def file, though.
2005-06-26 20:07:13 +02:00
uninstall-local: uninstall-ms-lib uninstall-def-file
require automake 1.7. Add calls to libtoolize and gtkdocize. Clean up some 2003-03-01 James Henstridge <james@daa.com.au> * autogen.sh: require automake 1.7. Add calls to libtoolize and gtkdocize. Clean up some of the error messages. * configure.in: move version declaration to the top of the file (before AC_INIT), using M4 macros. GLIB_AC_DIVERT_BEFORE_HELP() calls no longer necessary, due to use of M4 macro expansion in help messages instead. Convert AC_ARG_WITH/AC_ARG_ENABLE calls to use AC_HELP_STRING to format help strings. Use quadrigraphs to get square brackets to show correctly. Replace gtk-doc checks with a call to GTK_DOC_CHECK() macro. Use AC_CONFIG_COMMANDS([glibconfig.h], ...) to output glibconfig.h, so that "./config.status glibconfig.h" works. Add an extra AC_CONFIG_FILES call listing other files we want generated by config.status protected by an "if false" block. This way automake generates the rules needed to rebuild the files for us. Add quotes in various places. * docs/reference/*/Makefile.am: convert to use the common gtk-doc.make file. This localises the complexity to a single makefile fragment maintained with gtk-doc itself. * */Makefile.am: remove unneeded rules to build win32 files with config.status. Automake now does this for us. Replace instances of @FOO@ with $(FOO) where appropriate -- this allows automake to do a better job checking the makefile. Add some files to DISTCLEANFILES where appropriate * Makefile.am: use the DISTCHECK_CONFIGURE_FLAGS variable to ensure that --enable-gtk-doc is passed to configure during a distcheck. Remove the custom distcheck, since the standard one will now do. * gobject/Makefile.am: switch to BUILT_SOURCES, since that now works.
2003-03-04 11:10:48 +01:00
Reference in New Issue Copy Permalink