ekiga r7406 - in trunk: . lib/engine lib/engine/addressbook lib/engine/addressbook/call-history lib/engine/addressbook/evolution lib/engine/addressbook/kab lib/engine/addressbook/ldap lib/engine/components lib/engine/components/call-history lib/engine/components/evolution lib/engine/components/kab lib/engine/components/ldap lib/engine/gui/gtk-frontend

[dsandras svn gnome org]

Author: dsandras
Date: Sun Nov 23 16:46:32 2008
New Revision: 7406
URL: http://svn.gnome.org/viewvc/ekiga?rev=7406&view=rev

Log:
Moved addressbook components to the components directory of the engine.


Added:
   trunk/lib/engine/components/call-history/   (props changed)
      - copied from r7404, /trunk/lib/engine/addressbook/call-history/
   trunk/lib/engine/components/evolution/   (props changed)
      - copied from r7404, /trunk/lib/engine/addressbook/evolution/
   trunk/lib/engine/components/kab/   (props changed)
      - copied from r7404, /trunk/lib/engine/addressbook/kab/
   trunk/lib/engine/components/ldap/   (props changed)
      - copied from r7404, /trunk/lib/engine/addressbook/ldap/
Removed:
   trunk/lib/engine/addressbook/call-history/
   trunk/lib/engine/addressbook/evolution/
   trunk/lib/engine/addressbook/kab/
   trunk/lib/engine/addressbook/ldap/
Modified:
   trunk/ChangeLog
   trunk/INSTALL
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/addressbook/Makefile.am
   trunk/lib/engine/components/Makefile.am
   trunk/lib/engine/components/call-history/Makefile.am
   trunk/lib/engine/components/evolution/Makefile.am
   trunk/lib/engine/components/kab/Makefile.am
   trunk/lib/engine/components/ldap/Makefile.am
   trunk/lib/engine/gui/gtk-frontend/Makefile.am

Modified: trunk/INSTALL
==============================================================================
--- trunk/INSTALL	(original)
+++ trunk/INSTALL	Sun Nov 23 16:46:32 2008
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
 Basic Installation
 ==================
 
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -67,6 +67,9 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
@@ -78,7 +81,7 @@
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
@@ -87,17 +90,15 @@
 
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
@@ -190,12 +191,12 @@
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Nov 23 16:46:32 2008
@@ -763,10 +763,9 @@
 lib/engine/account/Makefile
 lib/engine/account/skel/Makefile
 lib/engine/addressbook/Makefile
-lib/engine/addressbook/call-history/Makefile
-lib/engine/addressbook/evolution/Makefile
-lib/engine/addressbook/ldap/Makefile
-lib/engine/addressbook/kab/Makefile
+lib/engine/components/call-history/Makefile
+lib/engine/components/ldap/Makefile
+lib/engine/components/kab/Makefile
 lib/engine/addressbook/skel/Makefile
 lib/engine/chat/Makefile
 lib/engine/chat/echo/Makefile
@@ -808,6 +807,7 @@
 lib/engine/components/resource-list/Makefile
 lib/engine/components/xcap/Makefile
 lib/engine/components/opal/Makefile
+lib/engine/components/evolution/Makefile
 )
 
 

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Nov 23 16:46:32 2008
@@ -11,10 +11,10 @@
 	-I$(top_srcdir)/lib/engine/chat/skel				\
 	-I$(top_srcdir)/lib/engine/protocol/skel			\
 	-I$(top_srcdir)/lib/engine/addressbook/skel			\
-	-I$(top_srcdir)/lib/engine/addressbook/call-history		\
-	-I$(top_srcdir)/lib/engine/addressbook/evolution		\
-	-I$(top_srcdir)/lib/engine/addressbook/kab			\
-	-I$(top_srcdir)/lib/engine/addressbook/ldap			\
+	-I$(top_srcdir)/lib/engine/components/call-history		\
+	-I$(top_srcdir)/lib/engine/components/evolution		        \
+	-I$(top_srcdir)/lib/engine/components/kab			\
+	-I$(top_srcdir)/lib/engine/components/ldap			\
 	-I$(top_srcdir)/lib/engine/account/skel				\
 	-I$(top_srcdir)/lib/engine/presence/skel			\
 	-I$(top_srcdir)/lib/engine/presence/avahi			\
@@ -77,7 +77,7 @@
 	$(top_builddir)/lib/engine/protocol/skel/libgmprotocol.la	 				\
 	$(top_builddir)/lib/engine/framework/libgmframework.la 						\
 	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la 				\
-	$(top_builddir)/lib/engine/addressbook/call-history/libcall-history.la 				\
+	$(top_builddir)/lib/engine/components/call-history/libcall-history.la 				\
 	$(top_builddir)/lib/engine/account/skel/libaccount.la 						\
 	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la 					\
 	$(top_builddir)/lib/engine/presence/local-roster/liblocal-roster.la 				\
@@ -129,11 +129,11 @@
 endif
 
 if HAVE_EDS
-libekiga_engine_la_LIBADD += addressbook/evolution/libgmevolution.la
+libekiga_engine_la_LIBADD += components/evolution/libgmevolution.la
 endif
 
 if HAVE_LDAP
-libekiga_engine_la_LIBADD += addressbook/ldap/libgmldap.la
+libekiga_engine_la_LIBADD += components/ldap/libgmldap.la
 endif
 
 if HAVE_GSTREAMER
@@ -145,7 +145,7 @@
 endif
 
 if HAVE_KAB
-libekiga_engine_la_LIBADD += addressbook/kab/libgmkab.la
+libekiga_engine_la_LIBADD += components/kab/libgmkab.la
 endif
 
 if HAVE_XCAP

Modified: trunk/lib/engine/addressbook/Makefile.am
==============================================================================
--- trunk/lib/engine/addressbook/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/Makefile.am	Sun Nov 23 16:46:32 2008
@@ -1,18 +1,4 @@
-if HAVE_EDS
-EDS_DIR = evolution
-endif
-
-if HAVE_LDAP
-LDAP_DIR = ldap
-endif
-
-if HAVE_KAB
-KAB_DIR = kab
-endif
 
 SUBDIRS = 		\
-	skel 		\
-	call-history	\
-	$(EDS_DIR) 	\
-	$(LDAP_DIR)	\
-	$(KAB_DIR)
\ No newline at end of file
+	skel
+

Modified: trunk/lib/engine/components/Makefile.am
==============================================================================
--- trunk/lib/engine/components/Makefile.am	(original)
+++ trunk/lib/engine/components/Makefile.am	Sun Nov 23 16:46:32 2008
@@ -1,3 +1,15 @@
+if HAVE_LDAP
+LDAP_DIR = ldap
+endif
+
+if HAVE_KAB
+KAB_DIR = kab
+endif
+
+if HAVE_EDS
+EDS_DIR = evolution
+endif
+
 if HAVE_AVAHI
 AVAHI_DIR = avahi-publisher
 endif
@@ -15,9 +27,13 @@
 endif
 
 SUBDIRS =                       \
+	call-history	        \
 	gmconf-personal-details \
         opal                    \
 	$(AVAHI_DIR)            \
 	$(GSTREAMER_DIR)        \
 	$(KDE_DIR)              \
+	$(EDS_DIR) 	        \
+	$(LDAP_DIR)	        \
+	$(KAB_DIR)              \
 	$(XCAP_DIRS)

Modified: trunk/lib/engine/components/call-history/Makefile.am
==============================================================================
--- /trunk/lib/engine/addressbook/call-history/Makefile.am	(original)
+++ trunk/lib/engine/components/call-history/Makefile.am	Sun Nov 23 16:46:32 2008
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libcall-history.la
 
-call_history_dir = $(top_srcdir)/lib/engine/addressbook/call-history
+call_history_dir = $(top_srcdir)/lib/engine/components/call-history
 
 AM_CPPFLAGS = $(XML_CFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 

Modified: trunk/lib/engine/components/evolution/Makefile.am
==============================================================================
--- /trunk/lib/engine/addressbook/evolution/Makefile.am	(original)
+++ trunk/lib/engine/components/evolution/Makefile.am	Sun Nov 23 16:46:32 2008
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmevolution.la
 
-evolution_dir = $(top_srcdir)/lib/engine/addressbook/evolution
+evolution_dir = $(top_srcdir)/lib/engine/components/evolution
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS)
 

Modified: trunk/lib/engine/components/kab/Makefile.am
==============================================================================
--- /trunk/lib/engine/addressbook/kab/Makefile.am	(original)
+++ trunk/lib/engine/components/kab/Makefile.am	Sun Nov 23 16:46:32 2008
@@ -4,7 +4,7 @@
 noinst_LTLIBRARIES = libgmkab.la
 endif
 
-kab_dir = $(top_srcdir)/lib/engine/addressbook/kab
+kab_dir = $(top_srcdir)/lib/engine/components/kab
 
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(KAB_CFLAGS)
 

Modified: trunk/lib/engine/components/ldap/Makefile.am
==============================================================================
--- /trunk/lib/engine/addressbook/ldap/Makefile.am	(original)
+++ trunk/lib/engine/components/ldap/Makefile.am	Sun Nov 23 16:46:32 2008
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmldap.la
 
-ldap_dir = $(top_srcdir)/lib/engine/addressbook/ldap
+ldap_dir = $(top_srcdir)/lib/engine/components/ldap
 
 AM_CPPFLAGS = $(LDAP_CFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
 

Modified: trunk/lib/engine/gui/gtk-frontend/Makefile.am
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/Makefile.am	(original)
+++ trunk/lib/engine/gui/gtk-frontend/Makefile.am	Sun Nov 23 16:46:32 2008
@@ -14,7 +14,7 @@
 	-I$(top_srcdir)/lib/engine/protocol/skel 		\
 	-I$(top_srcdir)/lib/engine/account/skel 		\
 	-I$(top_srcdir)/lib/engine/addressbook/skel 		\
-	-I$(top_srcdir)/lib/engine/addressbook/call-history 	\
+	-I$(top_srcdir)/lib/engine/components/call-history 	\
 	-I$(top_srcdir)/lib/engine/gui/gtk-core 
 
 libgmgtk_frontend_la_SOURCES = \