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 /modules/cal-config-google | |
| 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 'modules/cal-config-google')
| -rw-r--r-- | modules/cal-config-google/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/cal-config-google/e-google-chooser.c | 2 | ||||
| -rw-r--r-- | modules/cal-config-google/evolution-cal-config-google.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/modules/cal-config-google/Makefile.am b/modules/cal-config-google/Makefile.am index 6467c436f0..3477c61a83 100644 --- a/modules/cal-config-google/Makefile.am +++ b/modules/cal-config-google/Makefile.am @@ -3,10 +3,11 @@ module_LTLIBRARIES = module-cal-config-google.la module_cal_config_google_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-cal-config-google\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(GDATA_CFLAGS) module_cal_config_google_la_SOURCES = \ @@ -20,9 +21,10 @@ module_cal_config_google_la_SOURCES = \ module_cal_config_google_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(GDATA_LIBS) module_cal_config_google_la_LDFLAGS = \ diff --git a/modules/cal-config-google/e-google-chooser.c b/modules/cal-config-google/e-google-chooser.c index 9dd2b326e7..d03c5dce8f 100644 --- a/modules/cal-config-google/e-google-chooser.c +++ b/modules/cal-config-google/e-google-chooser.c @@ -23,7 +23,7 @@ #include <gdata/gdata.h> #include <glib/gi18n-lib.h> -#include <libedataserverui/libedataserverui.h> +#include <e-util/e-util.h> #define E_GOOGLE_CHOOSER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/cal-config-google/evolution-cal-config-google.c b/modules/cal-config-google/evolution-cal-config-google.c index 2447e70b8a..97b4c7eeea 100644 --- a/modules/cal-config-google/evolution-cal-config-google.c +++ b/modules/cal-config-google/evolution-cal-config-google.c @@ -21,8 +21,7 @@ #include <libebackend/libebackend.h> -#include <misc/e-cal-source-config.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> #include "e-google-chooser-button.h" #include "e-google-chooser-dialog.h" |