[evolution-exchange] Fix order of linker flags.



commit 35792f22a372dc948e09d1a8a4295abbbd3a5cee
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Aug 2 23:49:06 2010 -0400

    Fix order of linker flags.
    
    FINALLY got this goddamn issue straightened out.
    This has been a thorn in my side for many a release.
    
    Distcheck passes once again.

 Makefile.am                |    2 +-
 docs/reference/Makefile.am |    2 +-
 server/lib/Makefile.am     |    8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 27a73b7..b84f149 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ EXTRA_DIST = \
 	intltool-update.in \
 	evolution-exchange-zip.in
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-gtk3
 
 # Generate a ChangeLog file from 'git log'
 dist-hook:
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 63701ce..bacc34c 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -39,8 +39,8 @@ GTKDOC_CFLAGS = \
 	$(LDAP_CFLAGS)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/server/storage/libexchange-storage.la \
 	$(GNOME_PLATFORM_LIBS) \
+	$(top_builddir)/server/storage/libexchange-storage.la \
 	$(LDAP_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/server/lib/Makefile.am b/server/lib/Makefile.am
index cc6f7f5..f188393 100644
--- a/server/lib/Makefile.am
+++ b/server/lib/Makefile.am
@@ -71,11 +71,11 @@ libexchange_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)
 
 libexchange_la_LIBADD = \
-	$(LDAP_LIBS) \
-	$(KRB5_LIBS) \
-	$(SOUP_LIBS) \
+	$(EVOLUTION_DATA_SERVER_LIBS) \
 	$(GNOME_PLATFORM_LIBS) \
-	$(EVOLUTION_DATA_SERVER_LIBS)
+	$(SOUP_LIBS) \
+	$(KRB5_LIBS) \
+	$(LDAP_LIBS)
 
 libexchange_la_SOURCES = \
 	$(MARSHAL_GENERATED) \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]