From 1939671d9da533e8af325f1810134f6bf7767121 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 2 Dec 2019 11:07:36 +0100 Subject: [PATCH] Simplify link sections. * modules/threadlib (Link): Stop mentioning LTLIBTHREAD. * modules/lock (Link): Likewise. * modules/cond (Link): Likewise. * modules/tls (Link): Likewise. * modules/yield (Link): Likewise. * modules/regex (Link): Likewise. * modules/localename (Link): Likewise. * modules/unicase/locale-language (Link): Likewise. * modules/thread (Link): Stop mentioning LTLIBMULTITHREAD. --- ChangeLog | 13 +++++++++++++ modules/cond | 2 +- modules/localename | 2 +- modules/lock | 2 +- modules/regex | 2 +- modules/thread | 2 +- modules/threadlib | 2 +- modules/tls | 2 +- modules/unicase/locale-language | 2 +- modules/yield | 2 +- 10 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1e45f6a43..7df2409c2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2019-12-02 Bruno Haible + + Simplify link sections. + * modules/threadlib (Link): Stop mentioning LTLIBTHREAD. + * modules/lock (Link): Likewise. + * modules/cond (Link): Likewise. + * modules/tls (Link): Likewise. + * modules/yield (Link): Likewise. + * modules/regex (Link): Likewise. + * modules/localename (Link): Likewise. + * modules/unicase/locale-language (Link): Likewise. + * modules/thread (Link): Stop mentioning LTLIBMULTITHREAD. + 2019-12-02 Bruno Haible thread tests: Avoid link error with --enable-threads=isoc+posix on AIX. diff --git a/modules/cond b/modules/cond index 5dc0e4048b..43b2bd67de 100644 --- a/modules/cond +++ b/modules/cond @@ -25,7 +25,7 @@ Include: "glthread/cond.h" Link: -$(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise +$(LIBTHREAD) License: LGPLv2+ diff --git a/modules/localename b/modules/localename index 1813d28f79..9eed220e7f 100644 --- a/modules/localename +++ b/modules/localename @@ -31,7 +31,7 @@ Include: Link: @INTL_MACOSX_LIBS@ -$(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise +$(LIBTHREAD) License: LGPLv2+ diff --git a/modules/lock b/modules/lock index 4b390ba765..c9d60d695c 100644 --- a/modules/lock +++ b/modules/lock @@ -26,7 +26,7 @@ Include: "glthread/lock.h" Link: -$(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise +$(LIBTHREAD) License: LGPLv2+ diff --git a/modules/regex b/modules/regex index dbfd379820..42c93443cf 100644 --- a/modules/regex +++ b/modules/regex @@ -49,7 +49,7 @@ Include: Link: -$(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise +$(LIBTHREAD) $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise License: diff --git a/modules/thread b/modules/thread index baa88872ae..1d530b0d3a 100644 --- a/modules/thread +++ b/modules/thread @@ -23,7 +23,7 @@ Include: "glthread/thread.h" Link: -$(LTLIBMULTITHREAD) when linking with libtool, $(LIBMULTITHREAD) otherwise +$(LIBMULTITHREAD) License: LGPLv2+ diff --git a/modules/threadlib b/modules/threadlib index 240406d554..f4fba84f88 100644 --- a/modules/threadlib +++ b/modules/threadlib @@ -20,7 +20,7 @@ lib_SOURCES += glthread/threadlib.c Include: Link: -$(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise +$(LIBTHREAD) License: LGPLv2+ diff --git a/modules/tls b/modules/tls index f4a5256308..96192cc454 100644 --- a/modules/tls +++ b/modules/tls @@ -20,7 +20,7 @@ Include: "glthread/tls.h" Link: -$(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise +$(LIBTHREAD) License: LGPLv2+ diff --git a/modules/unicase/locale-language b/modules/unicase/locale-language index d2e06f2f2b..0ca9c29f98 100644 --- a/modules/unicase/locale-language +++ b/modules/unicase/locale-language @@ -31,7 +31,7 @@ Include: Link: @INTL_MACOSX_LIBS@ -$(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise +$(LIBTHREAD) License: LGPLv3+ or GPLv2 diff --git a/modules/yield b/modules/yield index 71e00ea73d..5ca862067d 100644 --- a/modules/yield +++ b/modules/yield @@ -18,7 +18,7 @@ Include: "glthread/yield.h" Link: -$(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise +$(LIBTHREAD) $(YIELD_LIB) License: -- 2.39.5