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 /smime/lib | |
| parent | b61331ed03ac1c7a9b8614e25510040b9c60ae02 (diff) | |
| download | gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.gz gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.bz2 gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.lz gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.xz 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 'smime/lib')
| -rw-r--r-- | smime/lib/Makefile.am | 5 | ||||
| -rw-r--r-- | smime/lib/e-cert-db.c | 4 | ||||
| -rw-r--r-- | smime/lib/e-pkcs12.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index 5ef47070d4..ed052bfca9 100644 --- a/smime/lib/Makefile.am +++ b/smime/lib/Makefile.am @@ -14,6 +14,8 @@ libessmime_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(CERT_UI_CFLAGS) libessmime_la_SOURCES = \ @@ -29,10 +31,11 @@ libessmime_la_SOURCES = \ e-pkcs12.h libessmime_la_LIBADD = \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(CERT_UI_LIBS) libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index a98d085c43..1a5803fda1 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -48,9 +48,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <camel/camel.h> /* FIXME: this is where camel_init is defined; it shouldn't include everything else */ - -#include <libedataserverui/libedataserverui.h> +#include <camel/camel.h> /* private NSS defines used by PSM */ /* (must be declated before cert.h) */ diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index fa61033151..eef6acd32f 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -51,7 +51,7 @@ #include <fcntl.h> #include <unistd.h> -#include <libedataserverui/libedataserverui.h> +#include "e-util/e-util.h" #include "e-cert-db.h" #include "e-pkcs12.h" |