[seed] Bug #626177 - Wrong LDFLAGS was used in libseed/Makefile.am

[Alan Knowles <alank src gnome org>]

commit e540d7fbc2eb95ed5ae92b3ed47b601dcdad4615
Author: Funda Wang <fundawang gmail com>
Date:   Mon Aug 9 11:32:06 2010 +0800

    Bug #626177 - Wrong LDFLAGS was used in libseed/Makefile.am
    
    GOBJECT_INTROSPECTION_LIBS and WEBKIT_LIBS are acturally linking libs,
    rather than linker flags, they should be put into LIBADD, rather than LDFLAGS.
    
    See here:
    http://wiki.mandriva.com/en/Underlinking
    
    Futhermore, seed-types are calling dlerror() and dlsym(), but I could not find
    -ldl in Makefile.

 libseed/Makefile.am                 |    6 ++++--
 modules/cairo/Makefile.am           |    5 ++++-
 modules/canvas/Makefile.am          |    5 ++++-
 modules/dbus/Makefile.am            |    7 +++++--
 modules/example/Makefile.am         |    5 ++++-
 modules/ffi/Makefile.am             |    5 ++++-
 modules/gettext/Makefile.am         |    5 ++++-
 modules/gtkbuilder/Makefile.am      |    5 ++++-
 modules/libxml/Makefile.am          |    5 ++++-
 modules/mpfr/Makefile.am            |    7 ++++---
 modules/multiprocessing/Makefile.am |    5 ++++-
 modules/os/Makefile.am              |    5 ++++-
 modules/readline/Makefile.am        |    7 +++++--
 modules/sandbox/Makefile.am         |    5 ++++-
 modules/sqlite/Makefile.am          |    6 +++++-
 15 files changed, 63 insertions(+), 20 deletions(-)
---
diff --git a/libseed/Makefile.am b/libseed/Makefile.am
index 5b05e6e..0b2d2b1 100644
--- a/libseed/Makefile.am
+++ b/libseed/Makefile.am
@@ -36,12 +36,14 @@ libseed_la_CFLAGS = \
 	-DGOBJECT_INTROSPECTION_VERSION=$(GOBJECT_INTROSPECTION_VERSION)
 
 libseed_la_LDFLAGS = \
-	-no-undefined \
+	$(FFI_LDFLAGS)
+
+libseed_la_LIBADD = \
 	$(GOBJECT_INTROSPECTION_LIBS) \
 	$(WEBKIT_LIBS) \
 	$(SEED_PROFILE_LIBS) \
 	$(SEED_OSX_LIBS) \
-	$(FFI_LDFLAGS)
+	$(FFI_LIBS) -ldl
 
 seedheaders_HEADERS = seed.h seed-debug.h seed-module.h
 
diff --git a/modules/cairo/Makefile.am b/modules/cairo/Makefile.am
index 139601a..33e6ab4 100644
--- a/modules/cairo/Makefile.am
+++ b/modules/cairo/Makefile.am
@@ -35,7 +35,10 @@ libseed_cairo_la_LDFLAGS = \
 	-module -avoid-version \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(GDK_LDFLAGS) \
-	$(CAIRO_LDFLAGS) \
+	$(CAIRO_LDFLAGS)
+
+libseed_cairo_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/canvas/Makefile.am b/modules/canvas/Makefile.am
index 11a3929..5154da4 100644
--- a/modules/canvas/Makefile.am
+++ b/modules/canvas/Makefile.am
@@ -19,7 +19,10 @@ libseed_canvas_la_CFLAGS = \
 libseed_canvas_la_LDFLAGS = \
 	-module -avoid-version \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(CAIRO_LDFLAGS) \
+	$(CAIRO_LDFLAGS)
+
+libseed_canvas_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/dbus/Makefile.am b/modules/dbus/Makefile.am
index 9f7fdb3..aa1376f 100644
--- a/modules/dbus/Makefile.am
+++ b/modules/dbus/Makefile.am
@@ -37,10 +37,13 @@ libseed_dbusnative_la_CFLAGS = \
 libseed_dbusnative_la_LDFLAGS = \
 	-module -avoid-version \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	-L/lib \
-	-ldbus-1 \
 	$(DBUS_LDFLAGS) \
+	-L/lib
+
+libseed_dbusnative_la_LIBADD = \
+	-ldbus-1 \
 	-ldbus-glib-1 \
+	$(top_builddir)/libseed/libseed.la \
 	$(SEED_PROFILE_LIBS)
 
 
diff --git a/modules/example/Makefile.am b/modules/example/Makefile.am
index d58f8ec..4b360a1 100644
--- a/modules/example/Makefile.am
+++ b/modules/example/Makefile.am
@@ -16,7 +16,10 @@ AM_CPPFLAGS = \
 
 libseed_example_la_LDFLAGS = \
 	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_example_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/ffi/Makefile.am b/modules/ffi/Makefile.am
index d7e879d..4280cef 100644
--- a/modules/ffi/Makefile.am
+++ b/modules/ffi/Makefile.am
@@ -25,9 +25,12 @@ libseed_ffi_la_CFLAGS = \
 libseed_ffi_la_LDFLAGS = \
 	-module -avoid-version \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(SEED_PROFILE_LIBS) \
 	$(FFI_LDFLAGS)
 
+libseed_ffi_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
+	$(SEED_PROFILE_LIBS)
+
 endif
 
 
diff --git a/modules/gettext/Makefile.am b/modules/gettext/Makefile.am
index a182f4f..318fc91 100644
--- a/modules/gettext/Makefile.am
+++ b/modules/gettext/Makefile.am
@@ -16,7 +16,10 @@ AM_CPPFLAGS = \
 
 libseed_gettext_la_LDFLAGS = \
 	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_gettext_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/gtkbuilder/Makefile.am b/modules/gtkbuilder/Makefile.am
index 972efdc..1d6abe2 100644
--- a/modules/gtkbuilder/Makefile.am
+++ b/modules/gtkbuilder/Makefile.am
@@ -19,7 +19,10 @@ AM_CPPFLAGS = \
 libseed_gtkbuilder_la_LDFLAGS = \
 	-module -avoid-version \
 	$(GTK_LDFLAGS) \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_gtkbuilder_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/libxml/Makefile.am b/modules/libxml/Makefile.am
index a1dba7b..edfdb5f 100644
--- a/modules/libxml/Makefile.am
+++ b/modules/libxml/Makefile.am
@@ -20,7 +20,10 @@ AM_CPPFLAGS = \
 libseed_libxml_la_LDFLAGS = \
 	-module -avoid-version \
 	$(LIBXML_LDFLAGS) \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_libxml_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
 	$(SEED_PROFILE_LIBS)
 
 extensionsdir=$(datadir)/seed/extensions
diff --git a/modules/mpfr/Makefile.am b/modules/mpfr/Makefile.am
index d0497ec..8a926ed 100644
--- a/modules/mpfr/Makefile.am
+++ b/modules/mpfr/Makefile.am
@@ -19,10 +19,11 @@ AM_CPPFLAGS = \
 
 libseed_mpfr_la_LDFLAGS = \
 	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(SEED_PROFILE_LIBS)
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
 
-libseed_mpfr_la_LIBADD = -lmpfr -lgmp
+libseed_mpfr_la_LIBADD = -lmpfr -lgmp \
+	$(top_builddir)/libseed/libseed.la \
+	$(SEED_PROFILE_LIBS)
 
 EXTRA_DIST = seed-mpfr.h
 
diff --git a/modules/multiprocessing/Makefile.am b/modules/multiprocessing/Makefile.am
index 1e39007..b94d489 100644
--- a/modules/multiprocessing/Makefile.am
+++ b/modules/multiprocessing/Makefile.am
@@ -18,7 +18,10 @@ libseed_multiprocessing_la_CFLAGS = \
 
 libseed_multiprocessing_la_LDFLAGS = \
 	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_multiprocessing_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/os/Makefile.am b/modules/os/Makefile.am
index 0781937..cb97e6d 100644
--- a/modules/os/Makefile.am
+++ b/modules/os/Makefile.am
@@ -17,8 +17,11 @@ libseed_os_la_CFLAGS = \
 libseed_os_la_LDFLAGS = \
 	-module -avoid-version \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
+	$(SEED_DEBUG_LDFLAGS)
+
+libseed_os_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
 	-lutil \
-	$(SEED_DEBUG_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/readline/Makefile.am b/modules/readline/Makefile.am
index 8eff4e8..b0698f7 100644
--- a/modules/readline/Makefile.am
+++ b/modules/readline/Makefile.am
@@ -17,9 +17,12 @@ libseed_readline_la_CFLAGS = \
 
 libseed_readline_la_LDFLAGS = \
 	-module -avoid-version \
-	-lreadline \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(FFI_LDFLAGS) \
+	$(FFI_LDFLAGS)
+
+libseed_readline_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
+	-lreadline \
 	$(SEED_PROFILE_LIBS) 
 
 endif
diff --git a/modules/sandbox/Makefile.am b/modules/sandbox/Makefile.am
index 8a53221..96c186f 100644
--- a/modules/sandbox/Makefile.am
+++ b/modules/sandbox/Makefile.am
@@ -15,7 +15,10 @@ AM_CPPFLAGS = \
 
 libseed_sandbox_la_LDFLAGS = \
 	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_sandbox_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
 	$(SEED_PROFILE_LIBS)
 
 
diff --git a/modules/sqlite/Makefile.am b/modules/sqlite/Makefile.am
index deedaba..70823dd 100644
--- a/modules/sqlite/Makefile.am
+++ b/modules/sqlite/Makefile.am
@@ -20,7 +20,11 @@ libseed_sqlite_la_LDFLAGS = \
 	-module -avoid-version \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(SQLITE_LDFLAGS) \
-	$(SEED_DEBUG_LDFLAGS) \
+	$(SEED_DEBUG_LDFLAGS)
+
+libseed_sqlite_la_LIBADD = \
+	$(top_builddir)/libseed/libseed.la \
+	$(SQLITE_LIBS) \
 	$(SEED_PROFILE_LIBS)
 
 endif