[evolution] Remove a long lived win32 hack It seems that the dummy libraries are not needed anymore on windows n
- From: Fridrich Strba <strba src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Remove a long lived win32 hack It seems that the dummy libraries are not needed anymore on windows n
- Date: Fri, 5 Mar 2010 20:51:46 +0000 (UTC)
commit 855ba06dc0875e0dcffb9c5d388f8b30abd2deb2
Author: Fridrich Strba <fridrich strba bluewin ch>
Date: Fri Mar 5 21:43:30 2010 +0100
Remove a long lived win32 hack
It seems that the dummy libraries are not needed anymore on windows
nowadays.
Makefile.am | 1 -
addressbook/gui/contact-editor/Makefile.am | 5 +-
addressbook/gui/contact-list-editor/Makefile.am | 4 -
configure.ac | 1 -
mail/importers/Makefile.am | 6 -
widgets/misc/Makefile.am | 4 -
win32/Makefile.am | 66 --
win32/README | 13 -
win32/dummy.la | 32 -
win32/libemiscwidgets.def | 492 ----------
win32/libetable.def | 509 -----------
win32/libetext.def | 35 -
win32/libevolution-addressbook.def | 150 ---
win32/libevolution-calendar.def | 1109 -----------------------
win32/libevolution-mail-shared.def | 531 -----------
win32/libevolution-mail.def | 174 ----
win32/libfilter.def | 102 ---
17 files changed, 1 insertions(+), 3233 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e97c9ed..46355d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@ endif
SUBDIRS = \
m4 \
- win32 \
data \
smclient \
e-util \
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 8f66bbf..486d71e 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,7 +1,3 @@
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
-endif
-
privsolib_LTLIBRARIES = libecontacteditor.la
libecontacteditor_la_CPPFLAGS = \
@@ -37,6 +33,7 @@ libecontacteditor_la_LIBADD = \
$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
$(top_builddir)/addressbook/printing/libecontactprint.la \
+ $(top_builddir)/widgets/menus/.libs/libmenus.la \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(GNOME_PLATFORM_LIBS)
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index f875f3c..28015df 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -1,7 +1,3 @@
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
-endif
-
privsolib_LTLIBRARIES = libecontactlisteditor.la
libecontactlisteditor_la_CPPFLAGS = \
diff --git a/configure.ac b/configure.ac
index 2b93435..0f4290d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1598,7 +1598,6 @@ AC_SUBST(EVOLUTION_DIR)
AC_CONFIG_FILES([ po/Makefile.in
Makefile
-win32/Makefile
a11y/Makefile
addressbook/Makefile
addressbook/conduit/Makefile
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 5e1fdd5..65e099b 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -1,8 +1,3 @@
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = \
- $(top_builddir)/win32/libevolution-mail.la
-endif
-
privsolib_LTLIBRARIES = libevolution-mail-importers.la
libevolution_mail_importers_la_CPPFLAGS = \
@@ -27,7 +22,6 @@ libevolution_mail_importers_la_SOURCES = \
libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_mail_importers_la_LIBADD = \
- $(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/filter/libfilter.la \
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 44d8c9a..eec4edf 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -1,7 +1,3 @@
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la
-endif
-
privsolib_LTLIBRARIES = libemiscwidgets.la
widgetsincludedir = $(privincludedir)/misc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]