[vino] Change linking order so that external libraries are linked after vino code. Closes #589953.

[Robert Ancell <rancell src gnome org>]

commit 1be26128cd50e3bb91424d040bd117005e027d73
Author: Robert Ancell <robert ancell gmail com>
Date:   Wed Jul 29 10:41:14 2009 +1000

    Change linking order so that external libraries are linked after vino code. Closes #589953.

 ChangeLog          |    5 +++++
 server/Makefile.am |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 349830f..db0fb0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-29  Robert Ancell  <robert ancell gmail com>
+
+	* server/Makefile.am: Change linking order so that external libraries
+	  are linked after vino code. Closes #589953.
+
 2009-04-13  Jonh Wendell  <jwendell gnome org>
 
 	* configure.in: post-release bump version to 2.26.2
diff --git a/server/Makefile.am b/server/Makefile.am
index 86dc02a..8b2a0ef 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -25,6 +25,9 @@ INCLUDES = \
 libexec_PROGRAMS = vino-server
 
 vino_server_LDADD = \
+	$(top_builddir)/server/libvncserver/libvncserver.la \
+	$(top_builddir)/server/miniupnp/libminiupnp.la \
+	$(top_builddir)/server/smclient/libeggsmclient.la \
 	$(VINO_SERVER_LIBS) \
 	$(VINO_LIBNOTIFY_LIBS) \
 	$(VINO_KEYRING_LIBS) \
@@ -33,9 +36,6 @@ vino_server_LDADD = \
 	$(LIBGNUTLS_LIBS) \
 	$(LIBGCRYPT_LIBS) \
 	$(X_LIBS) $(XTEST_LIBS) $(XSHM_LIBS) $(XDAMAGE_LIBS) \
-	$(top_builddir)/server/libvncserver/libvncserver.la \
-	$(top_builddir)/server/miniupnp/libminiupnp.la \
-	$(top_builddir)/server/smclient/libeggsmclient.la \
 	$(NULL)
 
 if HTTP_SERVER