Change order of libs, put progs_LDADD last. Needed for cygwin, says

2001-02-04  Tor Lillqvist  <tml@iki.fi>

	* 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  <tml@iki.fi>

	* Makefile.am (progs_LDADD): Change order of libs to libgobject
	first, then libglib. Needed for cygwin, says jbdoll@kepri.re.kr.

diff --git a/ChangeLog b/ChangeLog
index 8c1984a1e67b396e9ba778b8d17fca38de2b9ad4..4d0cc4c67e6086b70d25cc03c5f0356c3ec843f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <tml@iki.fi>
 
        * giochannel.h

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8c1984a1e67b396e9ba778b8d17fca38de2b9ad4..4d0cc4c67e6086b70d25cc03c5f0356c3ec843f1 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <tml@iki.fi>
 
        * giochannel.h

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8c1984a1e67b396e9ba778b8d17fca38de2b9ad4..4d0cc4c67e6086b70d25cc03c5f0356c3ec843f1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <tml@iki.fi>
 
        * giochannel.h

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8c1984a1e67b396e9ba778b8d17fca38de2b9ad4..4d0cc4c67e6086b70d25cc03c5f0356c3ec843f1 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <tml@iki.fi>
 
        * giochannel.h

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8c1984a1e67b396e9ba778b8d17fca38de2b9ad4..4d0cc4c67e6086b70d25cc03c5f0356c3ec843f1 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <tml@iki.fi>
 
        * giochannel.h

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8c1984a1e67b396e9ba778b8d17fca38de2b9ad4..4d0cc4c67e6086b70d25cc03c5f0356c3ec843f1 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <tml@iki.fi>
 
        * giochannel.h

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8c1984a1e67b396e9ba778b8d17fca38de2b9ad4..4d0cc4c67e6086b70d25cc03c5f0356c3ec843f1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <tml@iki.fi>
 
        * giochannel.h

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8c1984a1e67b396e9ba778b8d17fca38de2b9ad4..4d0cc4c67e6086b70d25cc03c5f0356c3ec843f1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <tml@iki.fi>
 
        * giochannel.h

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 979ba2cc6195a199e880b2007885fe06c9e675bd..a0bbcb26f822544d143bdd3ddf06337e80047d7a 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <timj@gtk.org>
 
        * gparam.h: gtk-doc sucks for not dealing with #define inside enums.

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index a495ba917059913ec146e96db71d3ef390de388a..489f1176c1bafc8d7e76d772b5042790aedb2c6c 100644 (file)
--- 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 1d8ce8a1a0ade84633e6b60b2032de5cce014794..004f68e6ce6b9ab5c073002769db368c3a547eeb 100644 (file)
--- 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)