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 /shell/Makefile.am | |
| 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 'shell/Makefile.am')
| -rw-r--r-- | shell/Makefile.am | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 8e21c7eca2..16f3626733 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -36,9 +36,6 @@ eshellinclude_HEADERS = \ libeshell_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(NM_CPPFLAGS) \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/menus \ - -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ -I$(top_srcdir)/shell \ -I$(top_builddir) \ @@ -60,8 +57,8 @@ libeshell_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-shell\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EGG_SMCLIENT_CFLAGS) \ $(GTKHTML_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(CLUTTER_GTK_CFLAGS) libeshell_la_SOURCES = \ @@ -92,14 +89,9 @@ libeshell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libeshell_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/filter/libfilter.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/widgets/menus/libmenus.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(EGG_SMCLIENT_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(CLUTTER_GTK_LIBS) # Evolution executable @@ -111,9 +103,6 @@ endif evolution_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(NM_CPPFLAGS) \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/menus \ - -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ -I$(top_srcdir)/shell \ -DEVOLUTION_BINDIR=\""$(bindir)"\" \ @@ -134,7 +123,7 @@ evolution_CPPFLAGS = \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(GTKHTML_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(CLUTTER_GTK_CFLAGS) evolution_SOURCES = \ @@ -143,16 +132,10 @@ evolution_SOURCES = \ evolution_LDADD = \ libeshell.la \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ - $(top_builddir)/widgets/menus/libmenus.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/filter/libfilter.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(DBUS_GLIB_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(CLUTTER_GTK_LIBS) \ $(EVOLUTIONICON) |