aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-02-21 00:48:43 +0800
committerDan Winship <danw@src.gnome.org>2003-02-21 00:48:43 +0800
commit986f2ace070dfe610ffb7595e525a895d3a6fb43 (patch)
treeba2edc7f75f292ca7185749e2fd012893b6a7a30
parent893213be54fe28e3f80e133041ab2a11e20a719d (diff)
downloadgsoc2013-evolution-986f2ace070dfe610ffb7595e525a895d3a6fb43.tar
gsoc2013-evolution-986f2ace070dfe610ffb7595e525a895d3a6fb43.tar.gz
gsoc2013-evolution-986f2ace070dfe610ffb7595e525a895d3a6fb43.tar.bz2
gsoc2013-evolution-986f2ace070dfe610ffb7595e525a895d3a6fb43.tar.lz
gsoc2013-evolution-986f2ace070dfe610ffb7595e525a895d3a6fb43.tar.xz
gsoc2013-evolution-986f2ace070dfe610ffb7595e525a895d3a6fb43.tar.zst
gsoc2013-evolution-986f2ace070dfe610ffb7595e525a895d3a6fb43.zip
Make libemiscwidgets, libefilterbar, and libetimezonedialog dynamic
libraries, so they can be portably linked into the (shared library) components. (Part 1 of N.) svn path=/trunk/; revision=19971
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/component/Makefile.am2
-rw-r--r--addressbook/gui/widgets/Makefile.am8
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/Makefile.am4
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/Makefile.am4
-rw-r--r--my-evolution/ChangeLog5
-rw-r--r--my-evolution/Makefile.am2
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/Makefile.am4
-rw-r--r--widgets/ChangeLog6
-rw-r--r--widgets/e-timezone-dialog/Makefile.am6
-rw-r--r--widgets/misc/ChangeLog6
-rw-r--r--widgets/misc/Makefile.am22
15 files changed, 69 insertions, 26 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index d6f7c1b890..128f0395a7 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-20 Dan Winship <danw@ximian.com>
+
+ * gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
+ s/libemiscwidgets.a/libemiscwidgets.la/
+
+ * gui/widgets/Makefile.am: Likewise (in a bunch of commented-out
+ test programs)
+
2003-02-19 Dan Winship <danw@ximian.com>
* gui/widgets/e-addressbook-model.c: Make parent_class static.
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index d53fb4c7ac..c5e22211e2 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -58,7 +58,7 @@ libevolution_addressbook_la_LIBADD = \
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \
$(top_builddir)/libversit/libversit.a \
- $(top_builddir)/widgets/misc/libemiscwidgets.a \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/addressbook/gui/merging/libecardmerging.a \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/menus/libmenus.la \
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 44938fb100..2b9d7c88f2 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -98,7 +98,7 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
# $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
# $(top_builddir)/addressbook/printing/libecontactprint.a \
# $(top_builddir)/addressbook/gui/merging/libecardmerging.a \
-# $(top_builddir)/widgets/misc/libemiscwidgets.a \
+# $(top_builddir)/widgets/misc/libemiscwidgets.la \
# $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la \
# $(top_builddir)/e-util/libeutil.la \
# $(EVOLUTION_ADDRESSBOOK_LIBS) \
@@ -115,7 +115,7 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
# $(top_builddir)/e-util/ename/libename.la \
# $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
# $(top_builddir)/addressbook/printing/libecontactprint.a \
-# $(top_builddir)/widgets/misc/libemiscwidgets.a \
+# $(top_builddir)/widgets/misc/libemiscwidgets.la \
# $(top_builddir)/e-util/libeutil.la \
# $(EVOLUTION_ADDRESSBOOK_LIBS)
@@ -131,7 +131,7 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
# $(top_builddir)/addressbook/ename/libename.la \
# $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
# $(top_builddir)/addressbook/printing/libecontactprint.a \
-# $(top_builddir)/widgets/misc/libemiscwidgets.a \
+# $(top_builddir)/widgets/misc/libemiscwidgets.la \
# $(top_builddir)/e-util/libeutil.la
#
#minicard_widget_test_SOURCES = \
@@ -147,7 +147,7 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
# $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
# $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la \
# $(top_builddir)/addressbook/printing/libecontactprint.a \
-# $(top_builddir)/widgets/misc/libemiscwidgets.a \
+# $(top_builddir)/widgets/misc/libemiscwidgets.la \
# $(top_builddir)/e-util/libeutil.la \
# $(top_builddir)/addressbook/gui/merging/libecardmerging.a \
# $(EVOLUTION_ADDRESSBOOK_LIBS)
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 827cd63501..cad38bd5a8 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-20 Dan Winship <danw@ximian.com>
+
+ * gui/Makefile.am (libevolution_calendar_la_LIBADD):
+ s/libemiscwidgets.a/libemiscwidgets.la/ and likewise for
+ libetimezonedialog
+
2003-02-19 Ettore Perazzoli <ettore@ximian.com>
* pcs/Makefile.am: Split $(CORBA_GENERATED_H) rule from the
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 5836bb69ae..08c4a2dcb4 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -195,8 +195,8 @@ libevolution_calendar_la_LIBADD = \
$(top_builddir)/libversit/libversit.a \
$(top_builddir)/e-util/ename/libename.la \
dialogs/libcal-dialogs.a \
- $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a \
- $(top_builddir)/widgets/misc/libemiscwidgets.a \
+ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_CALENDAR_LIBS)
libevolution_calendar_la_LDFLAGS = -avoid-version -module
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8dc01c71d5..1ff63f46f5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-20 Dan Winship <danw@ximian.com>
+
+ * Makefile.am (libevolution_mail_la_LIBADD):
+ s/libemiscwidgets.a/libemiscwidgets.la/ and likewise for
+ libefilterbar
+
2003-02-18 Jeffrey Stedfast <fejj@ximian.com>
* mail-callbacks.c (mark_all_as_seen): Fixed a memory leak - make
diff --git a/mail/Makefile.am b/mail/Makefile.am
index a7d2d36f02..422fdba2f2 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -157,8 +157,8 @@ libevolution_mail_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/composer/libcomposer.a \
- $(top_builddir)/widgets/misc/libemiscwidgets.a \
- $(top_builddir)/widgets/misc/libefilterbar.a \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/widgets/misc/libefilterbar.la \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/libversit/libversit.a \
$(top_builddir)/e-util/ename/libename.la \
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index ef383c0cc3..b87b0d9dc1 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-20 Dan Winship <danw@ximian.com>
+
+ * Makefile.am (summary_libs):
+ s/libemiscwidgets.a/libemiscwidgets.la/
+
2003-02-19 Dan Winship <danw@ximian.com>
* e-summary-rdf.c: Declare xmlSubstituteEntitiesDefaultValue
diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index e86b7c9e5f..8dbc4bdff6 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -67,7 +67,7 @@ summary_sources = \
summary_libs = \
$(top_builddir)/calendar/gui/alarm-notify/libalarm.a \
$(top_builddir)/shell/libeshell.la \
- $(top_builddir)/widgets/misc/libemiscwidgets.a \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b9b900caf7..c43552e801 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-20 Dan Winship <danw@ximian.com>
+
+ * Makefile.am (evolution_LDADD):
+ s/libemiscwidgets.a/libemiscwidgets.la/ and likewise for
+ libetimezonedialog
+
2003-02-18 Ettore Perazzoli <ettore@ximian.com>
* e-shortcuts.c (shortcut_item_new): Get the name from the name,
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 32e4dadf36..8c4a544108 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -239,8 +239,8 @@ evolution_SOURCES = \
evolution_LDADD = \
libeshell.la \
importer/libevolution-importer.la \
- $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a \
- $(top_builddir)/widgets/misc/libemiscwidgets.a \
+ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libical/src/libical/libical-evolution.la \
$(SHELL_LIBS)
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index d0458a8b0f..eaf7097ce7 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-20 Dan Winship <danw@ximian.com>
+
+ * e-timezone-dialog/Makefile.am: Make this a dynamic lib rather
+ than static so it can be portably linked into the shlib
+ components.
+
2003-02-06 Dan Winship <danw@ximian.com>
* e-timezone-dialog/e-timezone-dialog.glade: Set response_ids on
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index bb2847c753..b264145228 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -6,10 +6,10 @@ INCLUDES = \
-DG_LOG_DOMAIN=__FILE__ \
$(GNOME_FULL_CFLAGS)
-noinst_LIBRARIES = \
- libetimezonedialog.a
+noinst_LTLIBRARIES = \
+ libetimezonedialog.la
-libetimezonedialog_a_SOURCES = \
+libetimezonedialog_la_SOURCES = \
e-timezone-dialog.c \
e-timezone-dialog.h
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index fb4325db8f..b104a7e170 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-20 Dan Winship <danw@ximian.com>
+
+ * Makefile.am: Make libemiscwidgets and libefilterbar dynamic
+ libraries instead of static so they can be portably linked into
+ the shlib components
+
2003-02-05 Dan Winship <danw@ximian.com>
* Makefile.am (INCLUDES): Define MAP_DIR in terms of $(imagesdir).
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index c247fa04c0..7e2ecbd3dc 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -8,8 +8,8 @@ INCLUDES = \
-DG_LOG_DOMAIN=__FILE__ \
$(GNOME_FULL_CFLAGS)
-privlib_LIBRARIES = \
- libemiscwidgets.a
+privlib_LTLIBRARIES = \
+ libemiscwidgets.la
widgetsincludedir = $(privincludedir)/widgets
@@ -31,7 +31,7 @@ widgetsinclude_HEADERS = \
e-title-bar.h \
e-url-entry.h
-libemiscwidgets_a_SOURCES = \
+libemiscwidgets_la_SOURCES = \
$(widgetsinclude_HEADERS) \
e-calendar.c \
e-calendar-item.c \
@@ -65,11 +65,11 @@ e-util-marshal.c: e-util-marshal.h
MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
-libemiscwidgets_a_LIBADD = $(top_builddir)/e-util/libeutil.la
+libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la
-noinst_LIBRARIES = libefilterbar.a
+noinst_LTLIBRARIES = libefilterbar.la
-libefilterbar_a_SOURCES = \
+libefilterbar_la_SOURCES = \
e-filter-bar.c \
e-filter-bar.h
@@ -86,7 +86,7 @@ test_calendar_SOURCES = \
test-calendar.c
test_calendar_LDADD = \
- ./libemiscwidgets.a \
+ ./libemiscwidgets.la \
../../e-util/libeutil.la \
$(GNOME_FULL_LIBS)
@@ -96,7 +96,7 @@ test_dateedit_SOURCES = \
test-dateedit.c
test_dateedit_LDADD = \
- ./libemiscwidgets.a \
+ ./libemiscwidgets.la \
../../e-util/libeutil.la \
$(GNOME_FULL_LIBS)
@@ -106,7 +106,7 @@ test_dropdown_button_SOURCES = \
test-dropdown-button.c
test_dropdown_button_LDADD = \
- ./libemiscwidgets.a \
+ ./libemiscwidgets.la \
$(GNOME_FULL_LIBS)
# test-multi-config-dialog
@@ -115,7 +115,7 @@ test_multi_config_dialog_SOURCES = \
test-multi-config-dialog.c
test_multi_config_dialog_LDADD = \
- ./libemiscwidgets.a \
+ ./libemiscwidgets.la \
$(GNOME_FULL_LIBS)
# test-title-bar
@@ -124,7 +124,7 @@ test_title_bar_SOURCES = \
test-title-bar.c
test_title_bar_LDADD = \
- ./libemiscwidgets.a \
+ ./libemiscwidgets.la \
$(GNOME_FULL_LIBS)