[evolution-data-server] Remove libedataserverui.



commit a61e43b262663f88c8ff66e1b522dcab56f4710a
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Dec 10 08:19:32 2012 -0500

    Remove libedataserverui.
    
    Evolution is the only consumer of libedataserverui.  The library has
    been merged into Evolution's own libeutil which is not restrained by
    backward-compatibility promises.

 Makefile.am                                        |    2 +-
 configure.ac                                       |   28 +-
 docs/reference/Makefile.am                         |    1 -
 docs/reference/libedataserverui/Makefile.am        |   44 -
 .../libedataserverui/libedataserverui-docs.sgml    |   94 -
 .../libedataserverui/libedataserverui-sections.txt |  446 ---
 .../libedataserverui/libedataserverui.types        |   17 -
 libedataserverui/Makefile.am                       |  112 -
 libedataserverui/e-book-auth-util.c                |  187 -
 libedataserverui/e-book-auth-util.h                |   49 -
 libedataserverui/e-categories-dialog.c             |  156 -
 libedataserverui/e-categories-dialog.h             |   73 -
 libedataserverui/e-categories-editor.c             |  436 ---
 libedataserverui/e-categories-editor.h             |   88 -
 libedataserverui/e-categories-selector.c           |  589 ----
 libedataserverui/e-categories-selector.h           |   97 -
 libedataserverui/e-category-completion.c           |  505 ---
 libedataserverui/e-category-completion.h           |   72 -
 libedataserverui/e-category-editor.c               |  343 --
 libedataserverui/e-category-editor.h               |   81 -
 libedataserverui/e-cell-renderer-color.c           |  243 --
 libedataserverui/e-cell-renderer-color.h           |   79 -
 libedataserverui/e-client-utils.c                  |  448 ---
 libedataserverui/e-client-utils.h                  |   64 -
 libedataserverui/e-contact-store.c                 | 1370 --------
 libedataserverui/e-contact-store.h                 |   94 -
 libedataserverui/e-data-server-ui-marshal.list     |    3 -
 libedataserverui/e-destination-store.c             |  751 -----
 libedataserverui/e-destination-store.h             |  106 -
 libedataserverui/e-name-selector-dialog.c          | 1863 ----------
 libedataserverui/e-name-selector-dialog.h          |  100 -
 libedataserverui/e-name-selector-entry.c           | 3542 --------------------
 libedataserverui/e-name-selector-entry.h           |  124 -
 libedataserverui/e-name-selector-list.c            |  793 -----
 libedataserverui/e-name-selector-list.h            |   82 -
 libedataserverui/e-name-selector-model.c           |  663 ----
 libedataserverui/e-name-selector-model.h           |  108 -
 libedataserverui/e-name-selector.c                 |  658 ----
 libedataserverui/e-name-selector.h                 |   94 -
 libedataserverui/e-passwords-win32.c               | 1064 ------
 libedataserverui/e-passwords.c                     |  890 -----
 libedataserverui/e-passwords.h                     |   81 -
 libedataserverui/e-source-combo-box.c              |  701 ----
 libedataserverui/e-source-combo-box.h              |   90 -
 libedataserverui/e-source-selector-dialog.c        |  453 ---
 libedataserverui/e-source-selector-dialog.h        |   85 -
 libedataserverui/e-source-selector.c               | 2085 ------------
 libedataserverui/e-source-selector.h               |  141 -
 libedataserverui/e-tree-model-generator.c          | 1345 --------
 libedataserverui/e-tree-model-generator.h          |  104 -
 libedataserverui/libedataserverui.h                |   50 -
 libedataserverui/libedataserverui.pc.in            |   13 -
 tests/Makefile.am                                  |    2 +-
 tests/libedataserverui/Makefile.am                 |   55 -
 tests/libedataserverui/evolution-source-viewer.c   | 1176 -------
 tests/libedataserverui/test-category-completion.c  |   67 -
 tests/libedataserverui/test-contact-store.c        |  143 -
 tests/libedataserverui/test-name-selector.c        |  102 -
 tests/libedataserverui/test-source-combo-box.c     |  107 -
 tests/libedataserverui/test-source-selector.c      |  157 -
 60 files changed, 9 insertions(+), 23507 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8f6b082..aad317e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS=-I m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-private-docs --with-krb5=/usr --enable-introspection
 
-SUBDIRS = camel data private libedataserver libebackend addressbook calendar libedataserverui modules services tests docs art po
+SUBDIRS = camel data private libedataserver libebackend addressbook calendar modules services tests docs art po
 
 if HAVE_INTROSPECTION
 if HAVE_VALA
diff --git a/configure.ac b/configure.ac
index a9e4d2d..31995d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1284,6 +1284,12 @@ dnl sqlite3 flags
 dnl ******************************
 PKG_CHECK_MODULES(SQLITE3, [sqlite3 >= sqlite_minimum_version])
 
+if test "x$enable_maintainer_mode" = "xyes" ; then
+	EVO_SET_COMPILE_FLAGS(FACTORY_GTK, "gtk+-3.0")
+	AC_SUBST(FACTORY_GTK_CFLAGS)
+	AC_SUBST(FACTORY_GTK_LIBS)
+fi
+
 dnl ******************************
 dnl libedataserver flags
 dnl ******************************
@@ -1294,26 +1300,10 @@ AC_SUBST(E_DATA_SERVER_CFLAGS)
 AC_SUBST(E_DATA_SERVER_LIBS)
 
 dnl ******************************
-dnl libedataserverui
+dnl libebackend flags
 dnl ******************************
-E_DATA_SERVER_UI_DEPS="gtk+-3.0 libxml-2.0 libsoup-2.4"
-
-EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, , )
-AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
-AC_SUBST(E_DATA_SERVER_UI_LIBS)
-
-if test "x$enable_maintainer_mode" = "xyes" ; then
-	FACTORY_GTK_CFLAGS=$E_DATA_SERVER_UI_CFLAGS
-	FACTORY_GTK_LIBS=$E_DATA_SERVER_UI_LIBS
-	AC_SUBST(FACTORY_GTK_CFLAGS)
-	AC_SUBST(FACTORY_GTK_LIBS)
-fi
-
 E_BACKEND_DEPS="gio-2.0 gmodule-2.0 libsecret-1 libsoup-2.4 libxml-2.0"
 
-dnl ******************************
-dnl libebackend flags
-dnl ******************************
 EVO_SET_COMPILE_FLAGS(E_BACKEND, $E_BACKEND_DEPS)
 AC_SUBST(E_BACKEND_CFLAGS)
 AC_SUBST(E_BACKEND_LIBS)
@@ -1617,8 +1607,6 @@ libebackend/libebackend.pc
 libedataserver/Makefile
 libedataserver/eds-version.h
 libedataserver/libedataserver.pc
-libedataserverui/Makefile
-libedataserverui/libedataserverui.pc
 modules/Makefile
 modules/cache-reaper/Makefile
 modules/gnome-online-accounts/Makefile
@@ -1639,7 +1627,6 @@ tests/libecal/Makefile
 tests/libecal/client/Makefile
 tests/libedata-cal/Makefile
 tests/libedataserver/Makefile
-tests/libedataserverui/Makefile
 tests/tools/Makefile
 docs/Makefile
 docs/reference/Makefile
@@ -1651,7 +1638,6 @@ docs/reference/calendar/libecal/Makefile
 docs/reference/calendar/libedata-cal/Makefile
 docs/reference/camel/Makefile
 docs/reference/libedataserver/Makefile
-docs/reference/libedataserverui/Makefile
 docs/reference/libebackend/Makefile
 docs/reference/private/Makefile
 po/Makefile.in
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 2d64b2c..f1f2986 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -9,7 +9,6 @@ SUBDIRS = \
 	calendar \
 	camel \
 	libedataserver \
-	libedataserverui \
 	libebackend \
 	$(PRIVATE_DIR) \
 	$(NULL)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 46f96be..6c5f457 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libedataserver libedataserverui libebook libecal libedata-cal tools
+SUBDIRS = libedataserver libebook libecal libedata-cal tools
 
 @GNOME_CODE_COVERAGE_RULES@
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]