Use NO_UNDEFINED. Link with more libraries.

2005-06-27  Tor Lillqvist  <tml@novell.com>

	* */Makefile.am: Use NO_UNDEFINED. Link with more libraries.

svn path=/trunk/; revision=29593

22 files changed, 109 insertions, 25 deletions

diff --git a/plugins/addressbook-file/ChangeLog b/plugins/addressbook-file/ChangeLog
index 2ea475c72c..5226860c8f 100644
--- a/plugins/addressbook-file/ChangeLog
+++ b/plugins/addressbook-file/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
+	NO_UNDEFINED. Link with EVOLUTION_ADDRESSBOOK_LIBS.
+
 2005-06-18  Tor Lillqvist  <tml@novell.com>
 
 	* org-gnome-addressbook-file.eplug.in: Use SOEXT.
diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am
index 76ae687dfd..157388baa7 100644
--- a/plugins/addressbook-file/Makefile.am
+++ b/plugins/addressbook-file/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
-	$(EVOLUTION_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)		
 
 
@@ -11,6 +10,8 @@ plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la
 
 
 liborg_gnome_addressbook_file_la_SOURCES = addressbook-file.c
-liborg_gnome_addressbook_file_la_LDFLAGS = -module -avoid-version
+liborg_gnome_addressbook_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_addressbook_file_la_LIBADD =	\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 EXTRA_DIST = org-gnome-addressbook-file.eplug.in
diff --git a/plugins/calendar-file/ChangeLog b/plugins/calendar-file/ChangeLog
index 75c881bece..ab997ce745 100644
--- a/plugins/calendar-file/ChangeLog
+++ b/plugins/calendar-file/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
+	NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS.
+
 2005-06-18  Tor Lillqvist  <tml@novell.com>
 
 	* org-gnome-calendar-file.eplug.xml: Use SOEXT.
diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am
index 905ff3ef61..9f83dd8b48 100644
--- a/plugins/calendar-file/Makefile.am
+++ b/plugins/calendar-file/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
-	$(EVOLUTION_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(SOURCE_SEL_CFLAGS)
 
@@ -11,7 +10,9 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-file.la
 
 
 liborg_gnome_calendar_file_la_SOURCES = calendar-file.c
-liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version
+liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_calendar_file_la_LIBADD = 		\
+	$(EVOLUTION_CALENDAR_LIBS)
 
 EXTRA_DIST = org-gnome-calendar-file.eplug.xml
 
diff --git a/plugins/calendar-http/ChangeLog b/plugins/calendar-http/ChangeLog
index 68ebaa7350..76f8e551bb 100644
--- a/plugins/calendar-http/ChangeLog
+++ b/plugins/calendar-http/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
+	NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS.
+
 2005-06-18  Tor Lillqvist  <tml@novell.com>
 
 	* org-gnome-calendar-http.eplug.xml: Use SOEXT.
diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am
index 15e735fb43..69d6ab50a6 100644
--- a/plugins/calendar-http/Makefile.am
+++ b/plugins/calendar-http/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
-	$(EVOLUTION_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(SOURCE_SEL_CFLAGS)
 
@@ -11,7 +10,9 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-http.la
 
 
 liborg_gnome_calendar_http_la_SOURCES = calendar-http.c
-liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version
+liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_calendar_http_la_LIBADD =		\
+	$(EVOLUTION_CALENDAR_LIBS)
 
 EXTRA_DIST = org-gnome-calendar-http.eplug.xml
 
diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog
index 720760aa52..f6770e1622 100644
--- a/plugins/calendar-weather/ChangeLog
+++ b/plugins/calendar-weather/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
+	NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS.
+
 2005-06-18  Tor Lillqvist  <tml@novell.com>
 
 	* org-gnome-calendar-weather.eplug.xml: Use SOEXT.
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index 06c45d58d4..598521073b 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -3,7 +3,6 @@ weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather
 
 INCLUDES =									\
 	-I$(top_srcdir)/shell							\
-	$(EVOLUTION_CFLAGS)							\
 	$(EVOLUTION_CALENDAR_CFLAGS)						\
 	$(SOURCE_SEL_CFLAGS)							\
 	-DWEATHER_DATADIR=\""$(weatherdatadir)"\"				\
@@ -24,7 +23,10 @@ plugin_DATA = org-gnome-calendar-weather.eplug
 plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la
 
 liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c
-liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version
+liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_calendar_weather_la_LIBADD =		\
+	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
+	$(EVOLUTION_CALENDAR_LIBS)
 
 EXTRA_DIST =	\
 	org-gnome-calendar-weather.eplug.xml	\
diff --git a/plugins/default-source/ChangeLog b/plugins/default-source/ChangeLog
index bbcbf8bb12..094550343c 100644
--- a/plugins/default-source/ChangeLog
+++ b/plugins/default-source/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
+	NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS and
+	EVOLUTION_ADDRESSBOOK_LIBS.
+
 2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	* default-source.c: (org_gnome_default_book): Removed the extra
diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am
index 077164c578..b32ecffe60 100644
--- a/plugins/default-source/Makefile.am
+++ b/plugins/default-source/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
-	$(EVOLUTION_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)          \
 	$(SOURCE_SEL_CFLAGS)
@@ -12,6 +11,10 @@ plugin_LTLIBRARIES = liborg-gnome-default-source.la
 
 
 liborg_gnome_default_source_la_SOURCES = default-source.c
-liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version
+liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_default_source_la_LIBADD =		\
+	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
+
 
 EXTRA_DIST = org-gnome-default-source.eplug.in
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 174cb8ff42..e43612f02f 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
+
 2005-06-25  Harish Krishnaswamy <kharish@novell.com>
 
 	* Makefile.am: Reverting previous commit. Do not remove
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index c1658cceb2..821581cdcd 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -27,15 +27,19 @@ liborg_gnome_groupwise_features_la_SOURCES = \
 		status-track.c               \
 		addressbook-groupwise.c
 
-liborg_gnome_groupwise_features_la_LIBADD=             \
-	$(EVOLUTION_MAIL_LIBS)			       \
-	$(CAMEL_GROUPWISE_LIBS)                        \
-	$(top_builddir)/e-util/libeutil.la 	       \
-	$(top_builddir)/widgets/misc/libemiscwidgets.la
+liborg_gnome_groupwise_features_la_LIBADD=			\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(top_builddir)/filter/libfilter.la			\
+	$(top_builddir)/mail/libevolution-mail.la		\
+	$(EVOLUTION_CALENDAR_LIBS)				\
+	$(EVOLUTION_MAIL_LIBS)					\
+	$(CAMEL_GROUPWISE_LIBS)
 
 
 
-liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version
+liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 glade_DATA =properties.glade 
 
@@ -44,7 +48,7 @@ errordir = $(privdatadir)/errors
 
 EXTRA_DIST =						\
 	$(error_DATA)					\
-       	$(glade_DATA) 					\
+	$(glade_DATA) 					\
 	org-gnome-compose-send-options.xml		\
 	org-gnome-groupwise-features.eplug.xml
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index d95dba374c..ca449c1a9b 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
+
 2005-06-20  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	* itip-formatter.c: (find_my_address), (set_attendee),
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index 9b86685074..32cc7d2f33 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -9,7 +9,13 @@ plugin_DATA = org-gnome-itip-formatter.eplug
 plugin_LTLIBRARIES = liborg-gnome-itip-formatter.la
 
 liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h
-liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version
+liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_itip_formatter_la_LIBADD =				\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
+	$(top_builddir)/mail/libevolution-mail.la		\
+	$(CAMEL_LIBS)						\
+	$(EVOLUTION_CALENDAR_LIBS)
 
 error_DATA = org-gnome-itip-formatter.error
 errordir = $(privdatadir)/errors
diff --git a/plugins/mark-all-read/ChangeLog b/plugins/mark-all-read/ChangeLog
index dad5d087b1..fb619c5dce 100644
--- a/plugins/mark-all-read/ChangeLog
+++ b/plugins/mark-all-read/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
+
 2005-06-18  Tor Lillqvist  <tml@novell.com>
 
 	* org-gnome-mark-all-read.eplug.in: Use SOEXT.
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index d560bdb015..c5652ff145 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -9,6 +9,10 @@ plugin_DATA = org-gnome-mark-all-read.eplug
 plugin_LTLIBRARIES = liborg-gnome-mark-all-read.la
 
 liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c  
-liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version
+liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mark_all_read_la_LIBADD = 			\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-mark-all-read.eplug.in
diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog
index f4c973d974..bf35c265d2 100644
--- a/plugins/plugin-manager/ChangeLog
+++ b/plugins/plugin-manager/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
+
 2005-06-18  Tor Lillqvist  <tml@novell.com>
 
 	* org-gnome-plugin-manager.eplug.xml: Use SOEXT.
diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am
index 8816e6a06d..024551f2c9 100644
--- a/plugins/plugin-manager/Makefile.am
+++ b/plugins/plugin-manager/Makefile.am
@@ -8,7 +8,10 @@ plugin_DATA = org-gnome-plugin-manager.eplug org-gnome-plugin-manager.xml
 plugin_LTLIBRARIES = liborg-gnome-plugin-manager.la
 
 liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c
-liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version
+liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_plugin_manager_la_LIBADD =			\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST =						\
 	org-gnome-plugin-manager.eplug.xml		\
diff --git a/plugins/print-message/ChangeLog b/plugins/print-message/ChangeLog
index 66803f0239..faccad8b4b 100644
--- a/plugins/print-message/ChangeLog
+++ b/plugins/print-message/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
+
 2005-06-18  Tor Lillqvist  <tml@novell.com>
 
 	* org-gnome-print-message.eplug.xml: Use SOEXT.
diff --git a/plugins/print-message/Makefile.am b/plugins/print-message/Makefile.am
index f52c12cb2f..7b46d27c88 100644
--- a/plugins/print-message/Makefile.am
+++ b/plugins/print-message/Makefile.am
@@ -8,7 +8,11 @@ plugin_DATA = org-gnome-print-message.eplug org-gnome-print-message.xml
 plugin_LTLIBRARIES = liborg-gnome-print-message.la
 
 liborg_gnome_print_message_la_SOURCES = print-message.c
-liborg_gnome_print_message_la_LDFLAGS = -module -avoid-version
+liborg_gnome_print_message_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_print_message_la_LIBADD =			\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = 					\
 	org-gnome-print-message.eplug.xml\
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog
index dd7bd8d614..d8bbcf3654 100644
--- a/plugins/startup-wizard/ChangeLog
+++ b/plugins/startup-wizard/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-27  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
+
 2005-06-18  Tor Lillqvist  <tml@novell.com>
 
 	* org-gnome-evolution-startup-wizard.eplug.xml: Use SOEXT.
diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am
index 8d661435b7..e4abddc9e5 100644
--- a/plugins/startup-wizard/Makefile.am
+++ b/plugins/startup-wizard/Makefile.am
@@ -10,12 +10,17 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-startup-wizard.la
 liborg_gnome_evolution_startup_wizard_la_SOURCES = 	\
 	startup-wizard.c
 
-liborg_gnome_evolution_startup_wizard_la_LIBADD = 		\
-	$(top_builddir)/e-util/libeutil.la 			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+liborg_gnome_evolution_startup_wizard_la_LIBADD =			\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/shell/importer/libevolution-importer.la		\
+	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+	$(top_builddir)/calendar/gui/libevolution-calendar.la		\
+	$(top_builddir)/mail/libevolution-mail.la			\
+	$(EVOLUTION_CALENDAR_LIBS)					\
 	$(EVOLUTION_MAIL_LIBS)
 
-liborg_gnome_evolution_startup_wizard_la_LDFLAGS = -module -avoid-version
+liborg_gnome_evolution_startup_wizard_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 EXTRA_DIST = org-gnome-evolution-startup-wizard.eplug.xml