[evolution-patches] Win32 portability patch to Evolution's makefiles

From: Tor Lillqvist <tml novell com>
To: evolution-patches lists ximian com
Subject: [evolution-patches] Win32 portability patch to Evolution's makefiles
Date: Tue, 7 Jun 2005 19:42:03 +0300
This is the current Win32 patch to Evolution's makefiles. Should
mostly be self-evident:

- Add $(NO_UNDEFINED) to LDFLAGS, which expands to -no-undefined on
  Windows

- Add dependent libraries to LIBADDs

- Add a Windows specific hack to the gconftool invocations, necessary
  because of obscure build environment details you don't want to
  know...

- Remove some bogus -I switches

- Conditionally build some source code only on Unix for now

This patch shouldn't be seen in isolation. A patch to configure.in is
also related to this. It will follow. And in one place I had to remove
a -DDATADIR (because DATDIR clashes with a typedef in the silly Win32
headers), and that also requires then a small change in the source
file where DATADIR was used.

--tml

Index: a11y/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/a11y/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- a11y/Makefile.am	15 Mar 2004 06:21:51 -0000	1.6
+++ a11y/Makefile.am	7 Jun 2005 16:34:20 -0000
@@ -14,3 +14,8 @@
         ea-cell-table.h                         \
         ea-cell-table.c
 
+libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+
+libevolution_a11y_la_LIBADD = \
+	$(A11Y_LIBS)
+
Index: composer/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/composer/Makefile.am,v
retrieving revision 1.74
diff -u -r1.74 Makefile.am
--- composer/Makefile.am	6 May 2005 11:26:06 -0000	1.74
+++ composer/Makefile.am	7 Jun 2005 16:34:20 -0000
@@ -47,8 +47,6 @@
 	-I$(top_builddir)/widgets					\
 	-I$(top_srcdir)/widgets/misc					\
 	-I$(top_builddir)/widgets/misc					\
-	-I$(top_srcdir)/camel					 	\
-	-I$(top_builddir)/camel					 	\
 	-I$(top_srcdir)/addressbook/backend				\
 	-I$(top_builddir)/addressbook/backend				\
 	-I$(top_builddir)/shell						\
Index: e-util/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/e-util/Makefile.am,v
retrieving revision 1.127
diff -u -r1.127 Makefile.am
--- e-util/Makefile.am	25 May 2005 10:51:36 -0000	1.127
+++ e-util/Makefile.am	7 Jun 2005 16:34:20 -0000
@@ -95,6 +95,8 @@
 MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
 @EVO_MARSHAL_RULE@
 
+libeutil_la_LDFLAGS = $(NO_UNDEFINED)
+
 libeutil_la_LIBADD = $(E_UTIL_LIBS)
 
 econdinclude_HEADERS =		\
@@ -113,6 +115,10 @@
 endif
 
 libeconduit_la_SOURCES = $(pilot_compile)
+
+libeconduit_la_LDFLAGS = $(NO_UNDEFINED)
+
+libeconduit_la_LIBADD = $(E_UTIL_LIBS)
 
 error_DATA = e-system.error
 errordir = $(privdatadir)/errors
Index: filter/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/filter/Makefile.am,v
retrieving revision 1.57
diff -u -r1.57 Makefile.am
--- filter/Makefile.am	16 May 2005 06:14:34 -0000	1.57
+++ filter/Makefile.am	7 Jun 2005 16:34:20 -0000
@@ -42,6 +42,13 @@
 	rule-editor.c				\
 	rule-editor.h
 
+libfilter_la_LDFLAGS = $(NO_UNDEFINED)
+
+libfilter_la_LIBADD = 				\
+	$(top_builddir)/e-util/libeutil.la	\
+	$(LIBFILTER_LIBS)			\
+	$(REGEX_LIBS)
+
 EXTRA_DIST =					\
 	$(glade_DATA)				\
 	filter.error.xml			\
Index: mail/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/mail/Makefile.am,v
retrieving revision 1.263
diff -u -r1.263 Makefile.am
--- mail/Makefile.am	2 Jun 2005 04:30:16 -0000	1.263
+++ mail/Makefile.am	7 Jun 2005 16:34:20 -0000
@@ -1,3 +1,10 @@
+if OS_WIN32
+else
+PLATFORM_DEP_SOURCES =		\
+	em-junk-filter.c	\
+	em-junk-filter.h
+endif
+
 SUBDIRS = default importers
 
 mailincludedir = $(privincludedir)/mail
@@ -155,8 +162,6 @@
 	em-html-stream.c			\
 	em-icon-stream.c			\
 	em-inline-filter.c			\
-	em-junk-filter.c			\
-	em-junk-filter.h			\
 	em-junk-plugin.c			\
 	em-junk-plugin.h			\
 	em-mailer-prefs.c			\
@@ -206,7 +211,8 @@
 	message-tag-editor.c			\
 	message-tag-editor.h			\
 	message-tag-followup.c			\
-	message-tag-followup.h
+	message-tag-followup.h			\
+	$(PLATFORM_DEP_SOURCES)
 
 if ENABLE_SMIME
 SMIME_LIB=$(top_builddir)/smime/gui/libevolution-smime.la
@@ -214,7 +220,6 @@
 
 libevolution_mail_la_LIBADD =					\
 	$(top_builddir)/shell/importer/libevolution-importer.la	\
-	$(top_builddir)/mail/importers/libevolution-mail-importers.la\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/composer/libcomposer.la			\
@@ -225,11 +230,15 @@
 	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+	$(top_builddir)/mail/importers/libevolution-mail-importers.la\
 	$(SMIME_LIB)						\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_MAIL_LIBS)					\
+	$(GTKHTML_LIBS)						\
+	$(CAMEL_LIBS)						\
+	$(REGEX_LIBS)
 
 libevolution_mail_la_LDFLAGS =				\
-	-avoid-version -module
+	-avoid-version -module $(NO_UNDEFINED)
 
 libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
 
@@ -300,13 +309,24 @@
 
 @INTLTOOL_SCHEMAS_RULE@
 
+if OS_WIN32
+install-data-local:
+	if test -z "$(DESTDIR)" ; then \
+		for p in $(schema_DATA) ; do \
+			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
+			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
+			cmd /c _temp.bat; \
+			rm _temp.bat; \
+		done \
+	fi
+else
 install-data-local:
 	if test -z "$(DESTDIR)" ; then \
 		for p in $(schema_DATA) ; do \
 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
 		done \
 	fi
-
+endif
 
 # Prologue
 
Index: plugins/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/plugins/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- plugins/Makefile.am	13 May 2005 21:29:26 -0000	1.4
+++ plugins/Makefile.am	7 Jun 2005 16:34:20 -0000
@@ -1,2 +1,5 @@
+if OS_WIN32
+else
 SUBDIRS = $(plugins_enabled)
+endif
 DIST_SUBDIRS = $(plugins_base) $(plugins_standard) $(plugins_experimental) profiler
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.207
diff -u -r1.207 Makefile.am
--- shell/Makefile.am	2 Jun 2005 04:28:11 -0000	1.207
+++ shell/Makefile.am	7 Jun 2005 16:34:20 -0000
@@ -13,7 +13,6 @@
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"		\
 	-DPREFIX=\""$(prefix)"\"				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
-	-DDATADIR=\""$(datadir)"\"				\
 	-DLIBDIR=\""$(datadir)"\"				\
 	-DG_LOG_DOMAIN=\"evolution-shell\"			\
 	$(TZDIALOG_CFLAGS)					\
@@ -39,10 +38,13 @@
 	Evolution-skels.c	\
 	Evolution-stubs.c
 
+idl_defines = \
+	-D__Evolution_Component_COMPILATION
+
 IDL_GENERATED = $(IDL_GENERATED_H) $(IDL_GENERATED_C)
 
 $(IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(srcdir)/Evolution.idl
+	$(ORBIT_IDL) -I $(srcdir) $(idl_defines) $(IDL_INCLUDES) $(srcdir)/Evolution.idl
 
 $(IDL_GENERATED_C): $(IDL_GENERATED_H)
 
@@ -93,9 +95,12 @@
 	evolution-shell-component-utils.c	\
 	$(eshellinclude_HEADERS)
 
-libeshell_la_LIBADD =				\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la
+libeshell_la_LDFLAGS = $(NO_UNDEFINED)
+
+libeshell_la_LIBADD =					\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
+	$(SHELL_LIBS)
 
 # Evolution executable
 
@@ -156,7 +161,7 @@
 	libeshell.la			\
 	$(EVOLUTION_TEST_LIBS)
 
-libevolution_test_la_LDFLAGS = -avoid-version -module
+libevolution_test_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 if ENABLE_TEST_COMPONENT
 testserver_in_files = GNOME_Evolution_Test.server.in.in
@@ -188,24 +193,37 @@
 
 @INTLTOOL_SCHEMAS_RULE@
 
+if OS_WIN32
 install-data-local:
-	if test -z "$(DESTDIR)" ; then												\
-		for p in $(schema_DATA) ; do											\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p;		\
-		done														\
+	if test -z "$(DESTDIR)" ; then							\
+		for p in $(schema_DATA) ; do						\
+			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
+			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
+			cmd /c _temp.bat; 						\
+			rm _temp.bat;							\
+		done									\
 	fi
+else
+install-data-local:
+	if test -z "$(DESTDIR)" ; then							\
+		for p in $(schema_DATA) ; do						\
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
+				$(GCONFTOOL) --makefile-install-rule $$p;		\
+		done									\
+	fi
+endif
 
 install-evolution:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution$(EXEEXT) $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)$(EXEEXT)
 if DEFAULT_BINARY
-	cd $(DESTDIR)$(bindir) && rm -f evolution && $(LN_S) evolution-$(BASE_VERSION) evolution
+	cd $(DESTDIR)$(bindir) && rm -f evolution$(EXEEXT) && $(LN_S) evolution-$(BASE_VERSION)$(EXEEXT) evolution$(EXEEXT)
 endif
 
 uninstall-evolution:
-	$(LIBTOOL) --mode=uninstall rm -rf $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)
+	$(LIBTOOL) --mode=uninstall rm -rf $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)$(EXEEXT)
 if DEFAULT_BINARY
-	rm -f $(DESTDIR)$(bindir)/evolution
+	rm -f $(DESTDIR)$(bindir)/evolution$(EXEEXT)
 endif
 
 if HAVE_DTAPPINTEGRATE
Index: tools/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/tools/Makefile.am,v
retrieving revision 1.27
diff -u -r1.27 Makefile.am
--- tools/Makefile.am	5 Jan 2004 19:50:53 -0000	1.27
+++ tools/Makefile.am	7 Jun 2005 16:34:21 -0000
@@ -1,5 +1,11 @@
-privlibexec_PROGRAMS =			\
+if OS_WIN32
+else
+PLATFORM_DEP_TOOLS = \
 	killev
+endif
+
+privlibexec_PROGRAMS =		\
+	$(PLATFORM_DEP_TOOLS)
 
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"evolution-tools\"		\
Index: a11y/addressbook/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/a11y/addressbook/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- a11y/addressbook/Makefile.am	15 Mar 2004 08:15:51 -0000	1.2
+++ a11y/addressbook/Makefile.am	7 Jun 2005 16:34:21 -0000
@@ -1,3 +1,7 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
+endif
+
 privlib_LTLIBRARIES = libevolution-addressbook-a11y.la
 
 INCLUDES =						\
@@ -32,3 +36,9 @@
 			ea-addressbook-view.h		\
 			ea-addressbook.c		\
 			ea-addressbook.h
+
+libevolution_addressbook_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+
+libevolution_addressbook_a11y_la_LIBADD =	\
+	$(WIN32_BOOTSTRAP_LIBS)			\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
Index: a11y/calendar/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/a11y/calendar/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- a11y/calendar/Makefile.am	15 Jan 2005 16:59:18 -0000	1.12
+++ a11y/calendar/Makefile.am	7 Jun 2005 16:34:21 -0000
@@ -3,6 +3,10 @@
 # for debug
 #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
 
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-calendar.la
+endif
+
 privlib_LTLIBRARIES = libevolution-calendar-a11y.la
 
 INCLUDES =						\
@@ -51,5 +55,9 @@
 	ea-gnome-calendar.c			\
 	ea-gnome-calendar.h
 
-libevolution_calendar_a11y_la_LIBADD =   \
-        $(top_builddir)/a11y/libevolution-a11y.la
+libevolution_calendar_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+
+libevolution_calendar_a11y_la_LIBADD =			\
+        $(top_builddir)/a11y/libevolution-a11y.la	\
+	$(WIN32_BOOTSTRAP_LIBS)				\
+	$(EVOLUTION_CALENDAR_LIBS)
Index: a11y/widgets/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/a11y/widgets/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- a11y/widgets/Makefile.am	4 Jan 2005 07:40:37 -0000	1.4
+++ a11y/widgets/Makefile.am	7 Jun 2005 16:34:21 -0000
@@ -2,6 +2,10 @@
 # for debug
 #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
 
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la
+endif
+
 privlib_LTLIBRARIES = libevolution-widgets-a11y.la
 
 INCLUDES =						\
@@ -28,6 +32,9 @@
 	ea-widgets.c				\
 	ea-widgets.h
 
-libevolution_widgets_a11y_la_LIBADD =   \
-        $(top_builddir)/a11y/libevolution-a11y.la
-                                                                                
+libevolution_widgets_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+
+libevolution_widgets_a11y_la_LIBADD =			\
+        $(top_builddir)/a11y/libevolution-a11y.la	\
+	$(WIN32_BOOTSTRAP_LIBS)				\
+	$(EVOLUTION_CALENDAR_LIBS)
Index: addressbook/util/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/util/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- addressbook/util/Makefile.am	10 Feb 2005 05:34:04 -0000	1.10
+++ addressbook/util/Makefile.am	7 Jun 2005 16:34:21 -0000
@@ -17,6 +17,8 @@
 	eab-book-util.c					\
 	eab-book-util.h
 
+libeabutil_la_LDFLAGS = $(NO_UNDEFINED)
+
 libeabutil_la_LIBADD =					\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
 	$(top_builddir)/e-util/libeutil.la
Index: calendar/common/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/common/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- calendar/common/Makefile.am	31 Jan 2005 23:58:48 -0000	1.2
+++ calendar/common/Makefile.am	7 Jun 2005 16:34:21 -0000
@@ -25,4 +25,4 @@
 	$(top_builddir)/e-util/libeutil.la				\
 	$(EVOLUTION_CALENDAR_LIBS)
 
-libevolution_calendarprivate_la_LDFLAGS = -avoid-version
+libevolution_calendarprivate_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
Index: calendar/gui/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/Makefile.am,v
retrieving revision 1.303
diff -u -r1.303 Makefile.am
--- calendar/gui/Makefile.am	7 Jan 2005 11:38:57 -0000	1.303
+++ calendar/gui/Makefile.am	7 Jun 2005 16:34:22 -0000
@@ -1,3 +1,7 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la
+endif
+
 ## CORBA stuff
 
 IDLS =												   	\
@@ -214,6 +218,7 @@
 	weekday-picker.h
 
 libevolution_calendar_la_LIBADD =					\
+	$(WIN32_BOOTSTRAP_LIBS)						\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/shell/libeshell.la				\
 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
@@ -223,9 +228,10 @@
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la	\
 	$(LIBSOUP_LIBS)							\
+	$(CAMEL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
-libevolution_calendar_la_LDFLAGS = -avoid-version -module
+libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 server_in_files = GNOME_Evolution_Calendar.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@@ -252,12 +258,23 @@
 BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
+if OS_WIN32
+install-data-local:
+	if test -z "$(DESTDIR)"; then \
+		for p in $(schema_DATA); do \
+			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
+			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
+			cmd /c _temp.bat; \
+		done; \
+	fi
+else
 install-data-local:
 	if test -z "$(DESTDIR)"; then \
 		for p in $(schema_DATA); do \
 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
 		done; \
 	fi
+endif
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
Index: calendar/importers/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/importers/Makefile.am,v
retrieving revision 1.23
diff -u -r1.23 Makefile.am
--- calendar/importers/Makefile.am	10 Feb 2004 15:46:28 -0000	1.23
+++ calendar/importers/Makefile.am	7 Jun 2005 16:34:22 -0000
@@ -18,7 +18,7 @@
 	icalendar-importer.c		     \
 	main.c
 
-libevolution_calendar_importers_la_LDFLAGS = -avoid-version -module
+libevolution_calendar_importers_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 libevolution_calendar_importers_la_LIBADD = \
 	$(top_builddir)/shell/importer/libevolution-importer.la 	\
Index: mail/importers/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- mail/importers/Makefile.am	3 Dec 2004 03:38:03 -0000	1.28
+++ mail/importers/Makefile.am	7 Jun 2005 16:34:22 -0000
@@ -1,3 +1,13 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la
+else
+PLATFORM_DEP_SOURCES = 				\
+	elm-importer.c				\
+	pine-importer.c				\
+	netscape-importer.c			\
+	evolution-outlook-importer.c		\
+	evolution-mbox-importer.c
+endif
 
 privlib_LTLIBRARIES = libevolution-mail-importers.la
 
@@ -15,18 +25,17 @@
 libevolution_mail_importers_la_SOURCES =	\
 	mail-importer.c				\
 	mail-importer.h				\
-	elm-importer.c				\
-	pine-importer.c				\
-	netscape-importer.c			\
-	evolution-outlook-importer.c		\
-	evolution-mbox-importer.c
+	$(PLATFORM_DEP_SOURCES)
 
 libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/shell/importer/libevolution-importer.la	\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/shell/libeshell.la			\
+	$(WIN32_BOOTSTRAP_LIBS)					\
 	$(IMPORTERS_LIBS)
+
+libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED)
 
 server_in_files = \
 	GNOME_Evolution_Mail_Importers.server.in.in
Index: shell/importer/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/importer/Makefile.am,v
retrieving revision 1.22
diff -u -r1.22 Makefile.am
--- shell/importer/Makefile.am	5 Mar 2003 17:46:47 -0000	1.22
+++ shell/importer/Makefile.am	7 Jun 2005 16:34:22 -0000
@@ -50,6 +50,8 @@
 	evolution-importer-listener.h		\
 	evolution-importer.h
 
+libevolution_importer_la_LDFLAGS = $(NO_UNDEFINED)
+
 libevolution_importer_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la 	\
 	$(SHELL_LIBS)
Index: widgets/e-timezone-dialog/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/widgets/e-timezone-dialog/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- widgets/e-timezone-dialog/Makefile.am	10 Feb 2005 05:34:02 -0000	1.12
+++ widgets/e-timezone-dialog/Makefile.am	7 Jun 2005 16:34:22 -0000
@@ -1,3 +1,7 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la
+endif
+
 INCLUDES =								\
 	-I$(top_srcdir)							\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
@@ -10,6 +14,12 @@
 libetimezonedialog_la_SOURCES =	\
 	e-timezone-dialog.c	\
 	e-timezone-dialog.h
+
+libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED)
+
+libetimezonedialog_la_LIBADD =		\
+	$(WIN32_BOOTSTRAP_LIBS)		\
+	$(EVOLUTION_CALENDAR_LIBS)
 
 glade_DATA = e-timezone-dialog.glade
 
Index: widgets/menus/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/widgets/menus/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- widgets/menus/Makefile.am	10 Feb 2005 05:34:03 -0000	1.5
+++ widgets/menus/Makefile.am	7 Jun 2005 16:34:22 -0000
@@ -9,3 +9,9 @@
 libmenus_la_SOURCES = 		\
 	gal-view-menus.c	\
 	gal-view-menus.h
+
+libmenus_la_LDFLAGS = $(NO_UNDEFINED)
+
+libmenus_la_LIBADD =				\
+	$(top_builddir)/e-util/libeutil.la	\
+	$(GNOME_FULL_LIBS)
Index: widgets/misc/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/Makefile.am,v
retrieving revision 1.63
diff -u -r1.63 Makefile.am
--- widgets/misc/Makefile.am	16 May 2005 06:09:50 -0000	1.63
+++ widgets/misc/Makefile.am	7 Jun 2005 16:34:22 -0000
@@ -1,6 +1,10 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la
+endif
+
 INCLUDES =								\
 	-I$(top_srcdir)							\
-	-I$(top_srcdir)/a11y/widgets/					\
+	-I$(top_srcdir)/a11y/widgets					\
 	-DMAP_DIR=\""$(imagesdir)"\"					\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
@@ -80,13 +84,24 @@
 MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
 @EVO_MARSHAL_RULE@
 
-libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la		\
+libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
+
+libemiscwidgets_la_LIBADD =						\
+	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la	\
 	$(E_WIDGETS_LIBS)
 
 libefilterbar_la_SOURCES =	\
 	e-filter-bar.c		\
 	e-filter-bar.h
+
+libefilterbar_la_LDFLAGS = $(NO_UNDEFINED)
+
+libefilterbar_la_LIBADD =			\
+	$(WIN32_BOOTSTRAP_LIBS)			\
+	libemiscwidgets.la			\
+	$(E_WIDGETS_LIBS)			\
+	$(ICONV_LIBS)
 
 noinst_PROGRAMS = 			\
 	test-calendar			\
Index: addressbook/gui/component/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/Makefile.am,v
retrieving revision 1.110
diff -u -r1.110 Makefile.am
--- addressbook/gui/component/Makefile.am	6 Jan 2005 23:23:53 -0000	1.110
+++ addressbook/gui/component/Makefile.am	7 Jun 2005 16:34:23 -0000
@@ -57,11 +57,12 @@
 	$(top_builddir)/widgets/misc/libemiscwidgets.la					\
 	$(top_builddir)/widgets/menus/libmenus.la					\
 	$(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la		\
+	$(top_builddir)/e-util/libeutil.la						\
 	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
 
 
 
-libevolution_addressbook_la_LDFLAGS = -module -avoid-version
+libevolution_addressbook_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 # GConf schemas
 
@@ -73,12 +74,23 @@
 
 @INTLTOOL_SCHEMAS_RULE@
 
+if OS_WIN32
+install-data-local:
+	if test -z "$(DESTDIR)" ; then \
+		for p in $(schema_DATA) ; do \
+			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
+			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
+			cmd /c _temp.bat; \
+		done \
+	fi
+else
 install-data-local:
 	if test -z "$(DESTDIR)" ; then \
 		for p in $(schema_DATA) ; do \
 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
 		done \
 	fi
+endif
 
 server_in_files = GNOME_Evolution_Addressbook.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
Index: addressbook/gui/contact-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/Makefile.am,v
retrieving revision 1.58
diff -u -r1.58 Makefile.am
--- addressbook/gui/contact-editor/Makefile.am	10 Feb 2005 05:34:04 -0000	1.58
+++ addressbook/gui/contact-editor/Makefile.am	7 Jun 2005 16:34:23 -0000
@@ -1,3 +1,7 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
+endif
+
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/			\
@@ -6,8 +10,6 @@
 	-I$(top_srcdir)/addressbook/gui/merging		\
 	-I$(top_srcdir)/widgets/e-table			\
 	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/camel				\
-	-I$(top_builddir)/camel				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
@@ -34,11 +36,19 @@
 	e-contact-quick-add.c			\
 	e-contact-quick-add.h
 
+libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED)
+
+libecontacteditor_la_LIBADD =				\
+	$(WIN32_BOOTSTRAP_LIBS)				\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
+
 MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h
 @EVO_MARSHAL_RULE@
 
 glade_DATA = 				\
-	im.glade				\
+	im.glade			\
 	contact-editor.glade		\
 	fulladdr.glade			\
 	fullname.glade
Index: addressbook/gui/contact-list-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- addressbook/gui/contact-list-editor/Makefile.am	10 Feb 2005 05:34:04 -0000	1.24
+++ addressbook/gui/contact-list-editor/Makefile.am	7 Jun 2005 16:34:23 -0000
@@ -1,3 +1,7 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
+endif
+
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/			\
@@ -24,6 +28,16 @@
 	e-contact-list-editor.h			\
 	e-contact-list-model.c			\
 	e-contact-list-model.h
+
+libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED)
+
+libecontactlisteditor_la_LIBADD =						\
+	$(WIN32_BOOTSTRAP_LIBS)							\
+	$(top_builddir)/addressbook/util/libeabutil.la				\
+	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la	\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la				\
+	$(top_builddir)/e-util/libeutil.la					\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h
 @EVO_MARSHAL_RULE@
Index: calendar/conduits/calendar/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/conduits/calendar/Makefile.am,v
retrieving revision 1.40
diff -u -r1.40 Makefile.am
--- calendar/conduits/calendar/Makefile.am	2 Aug 2004 18:33:39 -0000	1.40
+++ calendar/conduits/calendar/Makefile.am	7 Jun 2005 16:34:23 -0000
@@ -11,7 +11,7 @@
 libecalendar_conduit_la_SOURCES = 	\
 	calendar-conduit.c
 
-libecalendar_conduit_la_LDFLAGS = -module -avoid-version
+libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 libecalendar_conduit_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/e-util/libeconduit.la	 			\
Index: calendar/conduits/todo/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/conduits/todo/Makefile.am,v
retrieving revision 1.42
diff -u -r1.42 Makefile.am
--- calendar/conduits/todo/Makefile.am	2 Aug 2004 18:33:39 -0000	1.42
+++ calendar/conduits/todo/Makefile.am	7 Jun 2005 16:34:23 -0000
@@ -11,7 +11,7 @@
 libetodo_conduit_la_SOURCES = 	\
 	todo-conduit.c
 
-libetodo_conduit_la_LDFLAGS = -module -avoid-version
+libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 libetodo_conduit_la_LIBADD = 						\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/e-util/libeconduit.la		 		\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]