From b6fef45d5ae3bbcaabe803101946ec5a0f1c2801 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 3 Feb 2001 22:32:10 +0000 Subject: [PATCH] Change order of libs, put progs_LDADD last. Needed for cygwin, says 2001-02-04 Tor Lillqvist * tests/Makefile.am (thread_LDADD): Change order of libs, put progs_LDADD last. Needed for cygwin, says jbdoll@kepri.re.kr. 2001-02-04 Tor Lillqvist * Makefile.am (progs_LDADD): Change order of libs to libgobject first, then libglib. Needed for cygwin, says jbdoll@kepri.re.kr. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gobject/ChangeLog | 5 +++++ gobject/Makefile.am | 2 +- tests/Makefile.am | 4 ++-- 11 files changed, 48 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c1984a..4d0cc4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Tor Lillqvist + + * tests/Makefile.am (thread_LDADD): Change order of libs, + put progs_LDADD last. Needed for cygwin, says jbdoll@kepri.re.kr. + 2001-02-02 Tor Lillqvist * giochannel.h diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8c1984a..4d0cc4c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-02-04 Tor Lillqvist + + * tests/Makefile.am (thread_LDADD): Change order of libs, + put progs_LDADD last. Needed for cygwin, says jbdoll@kepri.re.kr. + 2001-02-02 Tor Lillqvist * giochannel.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8c1984a..4d0cc4c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-02-04 Tor Lillqvist + + * tests/Makefile.am (thread_LDADD): Change order of libs, + put progs_LDADD last. Needed for cygwin, says jbdoll@kepri.re.kr. + 2001-02-02 Tor Lillqvist * giochannel.h diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 8c1984a..4d0cc4c 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2001-02-04 Tor Lillqvist + + * tests/Makefile.am (thread_LDADD): Change order of libs, + put progs_LDADD last. Needed for cygwin, says jbdoll@kepri.re.kr. + 2001-02-02 Tor Lillqvist * giochannel.h diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8c1984a..4d0cc4c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-02-04 Tor Lillqvist + + * tests/Makefile.am (thread_LDADD): Change order of libs, + put progs_LDADD last. Needed for cygwin, says jbdoll@kepri.re.kr. + 2001-02-02 Tor Lillqvist * giochannel.h diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8c1984a..4d0cc4c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-02-04 Tor Lillqvist + + * tests/Makefile.am (thread_LDADD): Change order of libs, + put progs_LDADD last. Needed for cygwin, says jbdoll@kepri.re.kr. + 2001-02-02 Tor Lillqvist * giochannel.h diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8c1984a..4d0cc4c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-02-04 Tor Lillqvist + + * tests/Makefile.am (thread_LDADD): Change order of libs, + put progs_LDADD last. Needed for cygwin, says jbdoll@kepri.re.kr. + 2001-02-02 Tor Lillqvist * giochannel.h diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8c1984a..4d0cc4c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-02-04 Tor Lillqvist + + * tests/Makefile.am (thread_LDADD): Change order of libs, + put progs_LDADD last. Needed for cygwin, says jbdoll@kepri.re.kr. + 2001-02-02 Tor Lillqvist * giochannel.h diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 979ba2c..a0bbcb2 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Tor Lillqvist + + * Makefile.am (progs_LDADD): Change order of libs to libgobject + first, then libglib. Needed for cygwin, says jbdoll@kepri.re.kr. + Wed Jan 31 06:19:49 2001 Tim Janik * gparam.h: gtk-doc sucks for not dealing with #define inside enums. diff --git a/gobject/Makefile.am b/gobject/Makefile.am index a495ba9..489f117 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -146,7 +146,7 @@ bin_PROGRAMS = gobject-query glib-genmarshal gobject_query_SOURCES = gobject-query.c glib_genmarshal_SOURCES = glib-genmarshal.c # link programs against libgobject -progs_LDADD = ../libglib-1.3.la libgobject-1.3.la +progs_LDADD = libgobject-1.3.la ../libglib-1.3.la glib_genmarshal_LDADD = ../libglib-1.3.la # can't have libgobject here gobject_query_LDADD = $(progs_LDADD) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1d8ce8a..004f68e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,8 +46,8 @@ TESTS = $(test_programs) $(test_scripts) TESTS_ENVIRONMENT = srcdir=$(srcdir) progs_LDADD = $(EFENCE) $(top_builddir)/libglib-1.3.la $(EFENCE) -thread_LDADD = $(progs_LDADD) $(top_builddir)/gthread/libgthread-1.3.la @G_THREAD_LIBS@ -module_LDADD = $(progs_LDADD) $(top_builddir)/gmodule/libgmodule-1.3.la @G_MODULE_LIBS@ +thread_LDADD = $(top_builddir)/gthread/libgthread-1.3.la @G_THREAD_LIBS@ $(progs_LDADD) +module_LDADD = $(top_builddir)/gmodule/libgmodule-1.3.la @G_MODULE_LIBS@ $(progs_LDADD) array_test_LDADD = $(progs_LDADD) date_test_LDADD = $(progs_LDADD) -- 2.7.4