[gnote] Fix build on non-Linux systems: add boot system lib, don't pass

[Hubert Figuière <hub src gnome org>]

commit f747d207c252b8a675aff055b3b2d0f09ac7ef39
Author: Hubert Figuiere <hub figuiere net>
Date:   Fri Jul 17 18:45:16 2009 -0400

    Fix build on non-Linux systems: add boot system lib, don't pass
    linker flags with -Wl, link libtomboy directly. (Closes #587228)
    (Closes #587261) (Closes #587262)

 src/Makefile.am         |    9 +++++----
 src/addins/addins.mk.in |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 37f6e6f..3f6d72d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,14 +13,15 @@ AM_CPPFLAGS= LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
 	-DGNOTE_LOCALEDIR=\"@GNOTE_LOCALEDIR \" \
 	-DDATADIR=\"$(datadir)\" -DLIBDIR=\"$(libdir)\"
 
-AM_LDFLAGS=-Wl,--export-dynamic
+AM_LDFLAGS=-export-dynamic
 
-GNOTE_LIBS = libgnote.a @LIBGLIBMM_LIBS@ @LIBGTKMM_LIBS@ \
-	@GCONF_LIBS@ @BOOST_FILESYSTEM_LIBS@ \
+GNOTE_LIBS = libgnote.a $(top_builddir)/libtomboy/libtomboy.la \
+	@LIBGLIBMM_LIBS@ @LIBGTKMM_LIBS@ \
+	@GCONF_LIBS@ @BOOST_FILESYSTEM_LIBS@ @BOOST_SYSTEM_LIBS@ \
 	@LIBXSLT_LIBS@ \
 	@PCRE_LIBS@ \
 	@GTKSPELL_LIBS@ @GTK_LIBS@ \
-	-luuid -L$(top_builddir)/libtomboy -ltomboy
+	-luuid
 
 noinst_LIBRARIES = libgnote.a
 bin_PROGRAMS = gnote
diff --git a/src/addins/addins.mk.in b/src/addins/addins.mk.in
index 6e05c2f..fc4e544 100644
--- a/src/addins/addins.mk.in
+++ b/src/addins/addins.mk.in
@@ -7,6 +7,6 @@ AM_CPPFLAGS= LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
 	@GCONF_CFLAGS@ @LIBXML_CFLAGS@ \
 	-DDATADIR=\"$(datadir)\" -DLIBDIR=\"$(libdir)\"
 
-AM_LDFLAGS = -avoid-version -module -Wl,--export-dynamic
+AM_LDFLAGS = -avoid-version -module -export-dynamic
 
 ADDINSDIR = @libdir@/@PACKAGE_NAME@/addins/@VERSION@