From 520d90a9cc9fb24551a28116c81ab6b963cac5c9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 Aug 2009 08:09:02 -0400 Subject: Build with -Wl,--no-undefined and fix linker errors. --- configure.ac | 1 + plugins/backup-restore/Makefile.am | 9 ++++++--- plugins/pst-import/Makefile.am | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 309491cf3a..8a2400ae84 100644 --- a/configure.ac +++ b/configure.ac @@ -104,6 +104,7 @@ dnl already fixed in git, just waiting for a formal release. dnl -DGTK_DISABLE_SINGLE_INCLUDES CFLAGS="$CFLAGS $WARNING_FLAGS" +LDFLAGS="$LDFLAGS -Wl,--no-undefined" AC_CANONICAL_HOST AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number]) diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index bc27b1d7a3..b848d3c51b 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -21,12 +21,15 @@ plugin_LTLIBRARIES = liborg-gnome-backup-restore.la liborg_gnome_backup_restore_la_SOURCES = backup-restore.c liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_backup_restore_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la +liborg_gnome_backup_restore_la_LIBADD = \ + $(SHELL_LIBS) \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/shell/libeshell.la privlibexec_PROGRAMS = evolution-backup evolution_backup_SOURCES = backup.c -evolution_backup_LDADD = $(SHELL_LIBS) \ +evolution_backup_LDADD = \ + $(SHELL_LIBS) \ $(top_builddir)/e-util/libeutil.la if OS_WIN32 diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 6196b4c571..56d4e21600 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -24,7 +24,10 @@ plugin_LTLIBRARIES = liborg-gnome-pst-import.la liborg_gnome_pst_import_la_SOURCES = pst-importer.c liborg_gnome_pst_import_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_pst_import_la_LIBADD = \ +liborg_gnome_pst_import_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_MAIL_LIBS) \ $(LIBPST_LIBS) EXTRA_DIST = org-gnome-pst-import.eplug.xml -- cgit v1.2.3