[evolution-data-server/dbus-calendar: 3/8] Remove the Bonobo factory



commit ddb649b33e6a1f4ac28f5778d424807e9482ea00
Author: Ross Burton <ross linux intel com>
Date:   Thu Aug 27 15:32:37 2009 +0100

    Remove the Bonobo factory

 Makefile.am                                 |    2 +-
 configure.ac                                |   12 -
 src/Evolution-DataServer.idl                |   40 ----
 src/GNOME_Evolution_DataServer.server.in.in |   53 -----
 src/Makefile.am                             |  102 ---------
 src/offline-listener.c                      |  173 ----------------
 src/offline-listener.h                      |   62 ------
 src/server-interface-check.c                |   67 ------
 src/server-interface-check.h                |   72 -------
 src/server-logging.c                        |  174 ----------------
 src/server-logging.h                        |   66 ------
 src/server.c                                |  295 ---------------------------
 12 files changed, 1 insertions(+), 1117 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 26819be..42100a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ LIBDB = libdb
 endif
 
 if ENABLE_CALENDAR
-CALENDAR_DIR = calendar src
+CALENDAR_DIR = calendar
 endif
 
 SUBDIRS = $(LIBDB) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui docs art po
diff --git a/configure.ac b/configure.ac
index 9236418..9453a33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1531,17 +1531,6 @@ dnl *****
 fi
 
 dnl ******************************
-dnl factory flags
-dnl ******************************
-E_FACTORY_DEPS="$mozilla_nspr"
-if test "x${enable_calendar}" = "xyes"; then
-	E_FACTORY_DEPS="$E_FACTORY_DEPS libical"
-fi
-EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $LIBICAL_EXTRA_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $LIBICAL_EXTRA_LIBS)
-AC_SUBST(E_FACTORY_CFLAGS)
-AC_SUBST(E_FACTORY_LIBS)
-
-dnl ******************************
 dnl Google flags
 dnl ******************************
 GDATA_DEPS="libsoup-2.4 libxml-2.0"
@@ -1789,7 +1778,6 @@ servers/google/libgdata/Makefile
 servers/google/libgdata/libgdata.pc
 servers/google/libgdata-google/Makefile
 servers/google/libgdata-google/libgdata-google.pc
-src/Makefile
 win32/Makefile
 docs/Makefile
 docs/reference/Makefile



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