diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-12-10 21:09:59 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-12-13 03:33:43 +0800 |
| commit | d09d8de870b6697c8a8b262e7e077b871a69b315 (patch) | |
| tree | 3b718882e7a0bb0a996daf2967a033d91714c9b5 /plugins/pst-import | |
| parent | b61331ed03ac1c7a9b8614e25510040b9c60ae02 (diff) | |
| download | gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.gz gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.zst gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.zip | |
Consolidate base utility libraries into libeutil.
Evolution consists of entirely too many small utility libraries, which
increases linking and loading time, places a burden on higher layers of
the application (e.g. modules) which has to remember to link to all the
small in-tree utility libraries, and makes it difficult to generate API
documentation for these utility libraries in one Gtk-Doc module.
Merge the following utility libraries under the umbrella of libeutil,
and enforce a single-include policy on libeutil so we can reorganize
the files as desired without disrupting its pseudo-public API.
libemail-utils/libemail-utils.la
libevolution-utils/libevolution-utils.la
filter/libfilter.la
widgets/e-timezone-dialog/libetimezonedialog.la
widgets/menus/libmenus.la
widgets/misc/libemiscwidgets.la
widgets/table/libetable.la
widgets/text/libetext.la
This also merges libedataserverui from the Evolution-Data-Server module,
since Evolution is its only consumer nowadays, and I'd like to make some
improvements to those APIs without concern for backward-compatibility.
And finally, start a Gtk-Doc module for libeutil. It's going to be a
project just getting all the symbols _listed_ much less _documented_.
But the skeletal structure is in place and I'm off to a good start.
Diffstat (limited to 'plugins/pst-import')
| -rw-r--r-- | plugins/pst-import/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/pst-import/pst-importer.c | 13 |
2 files changed, 9 insertions, 11 deletions
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index b81e0d29c2..8d5d294e33 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -14,10 +14,11 @@ plugin_LTLIBRARIES = liborg-gnome-pst-import.la liborg_gnome_pst_import_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_builddir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(LIBPST_CFLAGS) liborg_gnome_pst_import_la_SOURCES = pst-importer.c @@ -29,10 +30,10 @@ liborg_gnome_pst_import_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(LIBPST_LIBS) EXTRA_DIST = org-gnome-pst-import.eplug.xml diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 768d1b17c0..eced3ba259 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -41,22 +41,19 @@ #include <gtk/gtk.h> #include <libecal/libecal.h> #include <libebook/libebook.h> -#include <libedataserverui/libedataserverui.h> -#include <e-util/e-import.h> -#include <e-util/e-plugin.h> - -#include <libemail-utils/mail-mt.h> +#include <libemail-engine/mail-mt.h> #include <libemail-engine/mail-tools.h> -#include <mail/e-mail-backend.h> -#include <mail/em-folder-selection-button.h> -#include <mail/em-utils.h> #include <shell/e-shell.h> #include <shell/e-shell-window.h> #include <shell/e-shell-view.h> #include <shell/e-shell-sidebar.h> +#include <mail/e-mail-backend.h> +#include <mail/em-folder-selection-button.h> +#include <mail/em-utils.h> + #include <libpst/libpst.h> #include <libpst/timeconv.h> |