[ekiga] Moved the external plugins to their own directory

From: Julien Puydt <jpuydt src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [ekiga] Moved the external plugins to their own directory
Date: Mon, 31 Aug 2009 17:28:02 +0000 (UTC)
commit 3e358119ae7e4ea19dd83c7a37ac78207d5fe104
Author: Julien Puydt <jpuydt gnome org>
Date:   Mon Aug 31 19:27:11 2009 +0200

    Moved the external plugins to their own directory

 INSTALL                                            |  107 ++++++++++++++++----
 Makefile.am                                        |    2 +-
 configure.ac                                       |   17 ++--
 lib/engine/components/Makefile.am                  |   37 +-------
 plugins/Makefile.am                                |   36 +++++++
 .../components => plugins}/evolution/Makefile.am   |    2 +-
 .../evolution/evolution-book.cpp                   |    0
 .../evolution/evolution-book.h                     |    0
 .../evolution/evolution-contact.cpp                |    0
 .../evolution/evolution-contact.h                  |    0
 .../evolution/evolution-main.cpp                   |    0
 .../evolution/evolution-main.h                     |    0
 .../evolution/evolution-source.cpp                 |    0
 .../evolution/evolution-source.h                   |    0
 .../components => plugins}/gstreamer/Makefile.am   |    2 +-
 .../gstreamer/gst-audioinput.cpp                   |    0
 .../gstreamer/gst-audioinput.h                     |    0
 .../gstreamer/gst-audiooutput.cpp                  |    0
 .../gstreamer/gst-audiooutput.h                    |    0
 .../components => plugins}/gstreamer/gst-main.cpp  |    0
 .../components => plugins}/gstreamer/gst-main.h    |    0
 .../gstreamer/gst-videoinput.cpp                   |    0
 .../gstreamer/gst-videoinput.h                     |    0
 {lib/engine/components => plugins}/kab/Makefile.am |    2 +-
 .../engine/components => plugins}/kab/kab-book.cpp |    0
 {lib/engine/components => plugins}/kab/kab-book.h  |    0
 .../components => plugins}/kab/kab-contact.cpp     |    0
 .../components => plugins}/kab/kab-contact.h       |    0
 .../engine/components => plugins}/kab/kab-main.cpp |    0
 {lib/engine/components => plugins}/kab/kab-main.h  |    0
 .../components => plugins}/kab/kab-source.cpp      |    0
 .../engine/components => plugins}/kab/kab-source.h |    0
 {lib/engine/components => plugins}/kde/Makefile.am |    2 +-
 .../engine/components => plugins}/kde/kde-main.cpp |    0
 {lib/engine/components => plugins}/kde/kde-main.h  |    0
 .../engine/components => plugins}/ldap/Makefile.am |    2 +-
 .../components => plugins}/ldap/ldap-book.cpp      |    0
 .../engine/components => plugins}/ldap/ldap-book.h |    0
 .../components => plugins}/ldap/ldap-contact.cpp   |    0
 .../components => plugins}/ldap/ldap-contact.h     |    0
 .../components => plugins}/ldap/ldap-main.cpp      |    0
 .../engine/components => plugins}/ldap/ldap-main.h |    0
 .../components => plugins}/ldap/ldap-source.cpp    |    0
 .../components => plugins}/ldap/ldap-source.h      |    0
 .../components => plugins}/loudmouth/Makefile.am   |    2 +-
 .../loudmouth/loudmouth-account.cpp                |    0
 .../loudmouth/loudmouth-account.h                  |    0
 .../loudmouth/loudmouth-bank.cpp                   |    0
 .../loudmouth/loudmouth-bank.h                     |    0
 .../loudmouth/loudmouth-chat-simple.cpp            |    0
 .../loudmouth/loudmouth-chat-simple.h              |    0
 .../loudmouth/loudmouth-cluster.cpp                |    0
 .../loudmouth/loudmouth-cluster.h                  |    0
 .../loudmouth/loudmouth-dialect.cpp                |    0
 .../loudmouth/loudmouth-dialect.h                  |    0
 .../loudmouth/loudmouth-heap.cpp                   |    0
 .../loudmouth/loudmouth-heap.h                     |    0
 .../loudmouth/loudmouth-main.cpp                   |    0
 .../loudmouth/loudmouth-main.h                     |    0
 .../loudmouth/loudmouth-presentity.cpp             |    0
 .../loudmouth/loudmouth-presentity.h               |    0
 .../resource-list/Makefile.am                      |    8 +-
 .../resource-list/resource-list-main.cpp           |    0
 .../resource-list/resource-list-main.h             |    0
 .../resource-list/rl-cluster.cpp                   |    0
 .../resource-list/rl-cluster.h                     |    0
 .../resource-list/rl-entry-ref.cpp                 |    0
 .../resource-list/rl-entry-ref.h                   |    0
 .../resource-list/rl-entry.cpp                     |    0
 .../resource-list/rl-entry.h                       |    0
 .../resource-list/rl-heap.cpp                      |    0
 .../components => plugins}/resource-list/rl-heap.h |    0
 .../resource-list/rl-list.cpp                      |    0
 .../components => plugins}/resource-list/rl-list.h |    0
 .../resource-list/rl-presentity.cpp                |    0
 .../resource-list/rl-presentity.h                  |    0
 .../engine/components => plugins}/xcap/Makefile.am |    2 +-
 .../components => plugins}/xcap/xcap-core.cpp      |    0
 .../engine/components => plugins}/xcap/xcap-core.h |    0
 .../components => plugins}/xcap/xcap-main.cpp      |    0
 .../engine/components => plugins}/xcap/xcap-main.h |    0
 .../components => plugins}/xcap/xcap-path.cpp      |    0
 .../engine/components => plugins}/xcap/xcap-path.h |    0
 83 files changed, 144 insertions(+), 77 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index d3c5b40..2550dab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,15 +2,15 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
+   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-Briefly, the shell commands `./configure; make; make install' should
+   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.
@@ -73,9 +73,9 @@ The simplest way to compile this package is:
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -88,7 +88,7 @@ is an example:
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   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 can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
@@ -100,10 +100,24 @@ 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.
 
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -138,14 +152,46 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +229,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -201,11 +248,19 @@ an Autoconf bug.  Until the bug is fixed you can use this workaround:
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -232,6 +287,16 @@ an Autoconf bug.  Until the bug is fixed you can use this workaround:
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 
diff --git a/Makefile.am b/Makefile.am
index e8c3b92..7d31a0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = man sounds pixmaps lib src po 
+SUBDIRS = man sounds pixmaps lib src plugins po 
 
 ### Don't execute make in the help subdirectory if BULD_DOC is set
 if HAVE_GNOME_DOC_UTILS
diff --git a/configure.ac b/configure.ac
index 33cb16a..f3a7499 100644
--- a/configure.ac
+++ b/configure.ac
@@ -885,8 +885,6 @@ lib/engine/Makefile
 lib/engine/account/Makefile
 lib/engine/addressbook/Makefile
 lib/engine/components/call-history/Makefile
-lib/engine/components/ldap/Makefile
-lib/engine/components/kab/Makefile
 lib/engine/chat/Makefile
 lib/engine/friend-or-foe/Makefile
 lib/engine/framework/Makefile
@@ -907,16 +905,10 @@ lib/engine/gui/gtk-core/Makefile
 lib/engine/gui/gtk-frontend/Makefile
 lib/engine/components/Makefile
 lib/engine/components/avahi-publisher/Makefile
-lib/engine/components/evolution/Makefile
 lib/engine/components/gmconf-personal-details/Makefile
-lib/engine/components/gstreamer/Makefile
-lib/engine/components/kde/Makefile
 lib/engine/components/libnotify/Makefile
-lib/engine/components/loudmouth/Makefile
 lib/engine/components/opal/Makefile
-lib/engine/components/resource-list/Makefile
 lib/engine/components/gnome-session/Makefile
-lib/engine/components/xcap/Makefile
 lib/engine/components/null-audioinput/Makefile
 lib/engine/components/null-audiooutput/Makefile
 lib/engine/components/mlogo-videoinput/Makefile
@@ -924,6 +916,15 @@ lib/engine/components/x-videooutput/Makefile
 lib/engine/components/dx-videooutput/Makefile
 lib/engine/components/hal-dbus/Makefile
 lib/engine/components/echo/Makefile
+plugins/Makefile
+plugins/evolution/Makefile
+plugins/gstreamer/Makefile
+plugins/kab/Makefile
+plugins/kde/Makefile
+plugins/ldap/Makefile
+plugins/loudmouth/Makefile
+plugins/resource-list/Makefile
+plugins/xcap/Makefile
 )
 
 
diff --git a/lib/engine/components/Makefile.am b/lib/engine/components/Makefile.am
index 0a5e8af..1bcc13a 100644
--- a/lib/engine/components/Makefile.am
+++ b/lib/engine/components/Makefile.am
@@ -7,10 +7,6 @@ endif
 
 endif
 
-if HAVE_LDAP
-LDAP_DIR = ldap
-endif
-
 if HAVE_DX
 DX_DIR = dx-videooutput
 endif
@@ -19,38 +15,14 @@ if !WIN32
 X_DIR = x-videooutput
 endif
 
-if HAVE_KAB
-KAB_DIR = kab
-endif
-
-if HAVE_EDS
-EDS_DIR = evolution
-endif
-
 if HAVE_AVAHI
 AVAHI_DIR = avahi-publisher avahi
 endif
 
-if HAVE_GSTREAMER
-GSTREAMER_DIR = gstreamer
-endif
-
-if HAVE_KDE
-KDE_DIR = kde
-endif
-
 if HAVE_NOTIFY
 LIBNOTIFY_DIR = libnotify
 endif
 
-if HAVE_XCAP
-XCAP_DIRS = xcap resource-list
-endif
-
-if HAVE_LOUDMOUTH
-LOUDMOUTH_DIR = loudmouth
-endif
-
 SUBDIRS =                       \
 	call-history	        \
         echo                    \
@@ -64,13 +36,6 @@ SUBDIRS =                       \
 	$(GNOME_SESSION_DIR)	\
 	$(AVAHI_DIR)            \
 	$(DBUS_DIR)             \
-	$(GSTREAMER_DIR)        \
-	$(KDE_DIR)              \
 	$(LIBNOTIFY_DIR)	\
-	$(EDS_DIR) 	        \
-	$(LDAP_DIR)	        \
-	$(KAB_DIR)              \
 	$(DX_DIR)               \
-	$(X_DIR)                \
-	$(XCAP_DIRS)		\
-	$(LOUDMOUTH_DIR)
+	$(X_DIR)
\ No newline at end of file
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
new file mode 100644
index 0000000..e325557
--- /dev/null
+++ b/plugins/Makefile.am
@@ -0,0 +1,36 @@
+if HAVE_EDS
+EVOLUTION_DIR = evolution
+endif
+
+if HAVE_GSTREAMER
+GSTREAMER_DIR = gstreamer
+endif
+
+if HAVE_KAB
+KAB_DIR = kab
+endif
+
+if HAVE_KDE
+KDE_DIR = kde
+endif
+
+if HAVE_LDAP
+LDAP_DIR = ldap
+endif
+
+if HAVE_LOUDMOUTH
+LOUDMOUTH_DIR = loudmouth
+endif
+
+if HAVE_XCAP
+XCAP_DIRS = xcap resource-list
+endif
+
+SUBDIRS = \
+	$(EVOLUTION_DIR)
+	$(GSTREAMER_DIR) \
+	$(KAB_DIR) \
+	$(KDE_DIR) \
+	$(LDAP_DIR) \
+	$(LOUDMOUTH_DIR) \
+	$(XCAP_DIRS)
\ No newline at end of file
diff --git a/lib/engine/components/evolution/Makefile.am b/plugins/evolution/Makefile.am
similarity index 86%
rename from lib/engine/components/evolution/Makefile.am
rename to plugins/evolution/Makefile.am
index ee9455d..0df42a2 100644
--- a/lib/engine/components/evolution/Makefile.am
+++ b/plugins/evolution/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmevolution.la
 
-evolution_dir = $(top_srcdir)/lib/engine/components/evolution
+evolution_dir = $(top_srcdir)/plugins/evolution
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS)
 
diff --git a/lib/engine/components/evolution/evolution-book.cpp b/plugins/evolution/evolution-book.cpp
similarity index 100%
rename from lib/engine/components/evolution/evolution-book.cpp
rename to plugins/evolution/evolution-book.cpp
diff --git a/lib/engine/components/evolution/evolution-book.h b/plugins/evolution/evolution-book.h
similarity index 100%
rename from lib/engine/components/evolution/evolution-book.h
rename to plugins/evolution/evolution-book.h
diff --git a/lib/engine/components/evolution/evolution-contact.cpp b/plugins/evolution/evolution-contact.cpp
similarity index 100%
rename from lib/engine/components/evolution/evolution-contact.cpp
rename to plugins/evolution/evolution-contact.cpp
diff --git a/lib/engine/components/evolution/evolution-contact.h b/plugins/evolution/evolution-contact.h
similarity index 100%
rename from lib/engine/components/evolution/evolution-contact.h
rename to plugins/evolution/evolution-contact.h
diff --git a/lib/engine/components/evolution/evolution-main.cpp b/plugins/evolution/evolution-main.cpp
similarity index 100%
rename from lib/engine/components/evolution/evolution-main.cpp
rename to plugins/evolution/evolution-main.cpp
diff --git a/lib/engine/components/evolution/evolution-main.h b/plugins/evolution/evolution-main.h
similarity index 100%
rename from lib/engine/components/evolution/evolution-main.h
rename to plugins/evolution/evolution-main.h
diff --git a/lib/engine/components/evolution/evolution-source.cpp b/plugins/evolution/evolution-source.cpp
similarity index 100%
rename from lib/engine/components/evolution/evolution-source.cpp
rename to plugins/evolution/evolution-source.cpp
diff --git a/lib/engine/components/evolution/evolution-source.h b/plugins/evolution/evolution-source.h
similarity index 100%
rename from lib/engine/components/evolution/evolution-source.h
rename to plugins/evolution/evolution-source.h
diff --git a/lib/engine/components/gstreamer/Makefile.am b/plugins/gstreamer/Makefile.am
similarity index 93%
rename from lib/engine/components/gstreamer/Makefile.am
rename to plugins/gstreamer/Makefile.am
index 6e8da7a..a103fdf 100644
--- a/lib/engine/components/gstreamer/Makefile.am
+++ b/plugins/gstreamer/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmgstreamer.la
 
-gstreamer_dir = $(top_srcdir)/lib/engine/components/gstreamer/
+gstreamer_dir = $(top_srcdir)/plugins/gstreamer/
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GSTREAMER_CFLAGS) $(PTLIB_CFLAGS)
 
diff --git a/lib/engine/components/gstreamer/gst-audioinput.cpp b/plugins/gstreamer/gst-audioinput.cpp
similarity index 100%
rename from lib/engine/components/gstreamer/gst-audioinput.cpp
rename to plugins/gstreamer/gst-audioinput.cpp
diff --git a/lib/engine/components/gstreamer/gst-audioinput.h b/plugins/gstreamer/gst-audioinput.h
similarity index 100%
rename from lib/engine/components/gstreamer/gst-audioinput.h
rename to plugins/gstreamer/gst-audioinput.h
diff --git a/lib/engine/components/gstreamer/gst-audiooutput.cpp b/plugins/gstreamer/gst-audiooutput.cpp
similarity index 100%
rename from lib/engine/components/gstreamer/gst-audiooutput.cpp
rename to plugins/gstreamer/gst-audiooutput.cpp
diff --git a/lib/engine/components/gstreamer/gst-audiooutput.h b/plugins/gstreamer/gst-audiooutput.h
similarity index 100%
rename from lib/engine/components/gstreamer/gst-audiooutput.h
rename to plugins/gstreamer/gst-audiooutput.h
diff --git a/lib/engine/components/gstreamer/gst-main.cpp b/plugins/gstreamer/gst-main.cpp
similarity index 100%
rename from lib/engine/components/gstreamer/gst-main.cpp
rename to plugins/gstreamer/gst-main.cpp
diff --git a/lib/engine/components/gstreamer/gst-main.h b/plugins/gstreamer/gst-main.h
similarity index 100%
rename from lib/engine/components/gstreamer/gst-main.h
rename to plugins/gstreamer/gst-main.h
diff --git a/lib/engine/components/gstreamer/gst-videoinput.cpp b/plugins/gstreamer/gst-videoinput.cpp
similarity index 100%
rename from lib/engine/components/gstreamer/gst-videoinput.cpp
rename to plugins/gstreamer/gst-videoinput.cpp
diff --git a/lib/engine/components/gstreamer/gst-videoinput.h b/plugins/gstreamer/gst-videoinput.h
similarity index 100%
rename from lib/engine/components/gstreamer/gst-videoinput.h
rename to plugins/gstreamer/gst-videoinput.h
diff --git a/lib/engine/components/kab/Makefile.am b/plugins/kab/Makefile.am
similarity index 90%
rename from lib/engine/components/kab/Makefile.am
rename to plugins/kab/Makefile.am
index 6b0e12a..2faf1f1 100644
--- a/lib/engine/components/kab/Makefile.am
+++ b/plugins/kab/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmkab.la
 
-kab_dir = $(top_srcdir)/lib/engine/components/kab
+kab_dir = $(top_srcdir)/plugins/kab
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(KAB_CFLAGS)
 
diff --git a/lib/engine/components/kab/kab-book.cpp b/plugins/kab/kab-book.cpp
similarity index 100%
rename from lib/engine/components/kab/kab-book.cpp
rename to plugins/kab/kab-book.cpp
diff --git a/lib/engine/components/kab/kab-book.h b/plugins/kab/kab-book.h
similarity index 100%
rename from lib/engine/components/kab/kab-book.h
rename to plugins/kab/kab-book.h
diff --git a/lib/engine/components/kab/kab-contact.cpp b/plugins/kab/kab-contact.cpp
similarity index 100%
rename from lib/engine/components/kab/kab-contact.cpp
rename to plugins/kab/kab-contact.cpp
diff --git a/lib/engine/components/kab/kab-contact.h b/plugins/kab/kab-contact.h
similarity index 100%
rename from lib/engine/components/kab/kab-contact.h
rename to plugins/kab/kab-contact.h
diff --git a/lib/engine/components/kab/kab-main.cpp b/plugins/kab/kab-main.cpp
similarity index 100%
rename from lib/engine/components/kab/kab-main.cpp
rename to plugins/kab/kab-main.cpp
diff --git a/lib/engine/components/kab/kab-main.h b/plugins/kab/kab-main.h
similarity index 100%
rename from lib/engine/components/kab/kab-main.h
rename to plugins/kab/kab-main.h
diff --git a/lib/engine/components/kab/kab-source.cpp b/plugins/kab/kab-source.cpp
similarity index 100%
rename from lib/engine/components/kab/kab-source.cpp
rename to plugins/kab/kab-source.cpp
diff --git a/lib/engine/components/kab/kab-source.h b/plugins/kab/kab-source.h
similarity index 100%
rename from lib/engine/components/kab/kab-source.h
rename to plugins/kab/kab-source.h
diff --git a/lib/engine/components/kde/Makefile.am b/plugins/kde/Makefile.am
similarity index 75%
rename from lib/engine/components/kde/Makefile.am
rename to plugins/kde/Makefile.am
index 83d05f7..561c806 100644
--- a/lib/engine/components/kde/Makefile.am
+++ b/plugins/kde/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmkde.la
 
-kde_dir = $(top_srcdir)/lib/engine/components/kde
+kde_dir = $(top_srcdir)/plugins/kde
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(KDE_CFLAGS)
 
diff --git a/lib/engine/components/kde/kde-main.cpp b/plugins/kde/kde-main.cpp
similarity index 100%
rename from lib/engine/components/kde/kde-main.cpp
rename to plugins/kde/kde-main.cpp
diff --git a/lib/engine/components/kde/kde-main.h b/plugins/kde/kde-main.h
similarity index 100%
rename from lib/engine/components/kde/kde-main.h
rename to plugins/kde/kde-main.h
diff --git a/lib/engine/components/ldap/Makefile.am b/plugins/ldap/Makefile.am
similarity index 93%
rename from lib/engine/components/ldap/Makefile.am
rename to plugins/ldap/Makefile.am
index aae653b..5e30173 100644
--- a/lib/engine/components/ldap/Makefile.am
+++ b/plugins/ldap/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmldap.la
 
-ldap_dir = $(top_srcdir)/lib/engine/components/ldap
+ldap_dir = $(top_srcdir)/plugins/ldap
 
 AM_CPPFLAGS = $(LDAP_CFLAGS) $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
 
diff --git a/lib/engine/components/ldap/ldap-book.cpp b/plugins/ldap/ldap-book.cpp
similarity index 100%
rename from lib/engine/components/ldap/ldap-book.cpp
rename to plugins/ldap/ldap-book.cpp
diff --git a/lib/engine/components/ldap/ldap-book.h b/plugins/ldap/ldap-book.h
similarity index 100%
rename from lib/engine/components/ldap/ldap-book.h
rename to plugins/ldap/ldap-book.h
diff --git a/lib/engine/components/ldap/ldap-contact.cpp b/plugins/ldap/ldap-contact.cpp
similarity index 100%
rename from lib/engine/components/ldap/ldap-contact.cpp
rename to plugins/ldap/ldap-contact.cpp
diff --git a/lib/engine/components/ldap/ldap-contact.h b/plugins/ldap/ldap-contact.h
similarity index 100%
rename from lib/engine/components/ldap/ldap-contact.h
rename to plugins/ldap/ldap-contact.h
diff --git a/lib/engine/components/ldap/ldap-main.cpp b/plugins/ldap/ldap-main.cpp
similarity index 100%
rename from lib/engine/components/ldap/ldap-main.cpp
rename to plugins/ldap/ldap-main.cpp
diff --git a/lib/engine/components/ldap/ldap-main.h b/plugins/ldap/ldap-main.h
similarity index 100%
rename from lib/engine/components/ldap/ldap-main.h
rename to plugins/ldap/ldap-main.h
diff --git a/lib/engine/components/ldap/ldap-source.cpp b/plugins/ldap/ldap-source.cpp
similarity index 100%
rename from lib/engine/components/ldap/ldap-source.cpp
rename to plugins/ldap/ldap-source.cpp
diff --git a/lib/engine/components/ldap/ldap-source.h b/plugins/ldap/ldap-source.h
similarity index 100%
rename from lib/engine/components/ldap/ldap-source.h
rename to plugins/ldap/ldap-source.h
diff --git a/lib/engine/components/loudmouth/Makefile.am b/plugins/loudmouth/Makefile.am
similarity index 92%
rename from lib/engine/components/loudmouth/Makefile.am
rename to plugins/loudmouth/Makefile.am
index 8895884..422fe2a 100644
--- a/lib/engine/components/loudmouth/Makefile.am
+++ b/plugins/loudmouth/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmloudmouth.la
 
-loudmouth_dir = $(top_srcdir)/lib/engine/components/loudmouth
+loudmouth_dir = $(top_srcdir)/plugins/loudmouth
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS) $(LOUDMOUTH_CFLAGS)
 
diff --git a/lib/engine/components/loudmouth/loudmouth-account.cpp b/plugins/loudmouth/loudmouth-account.cpp
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-account.cpp
rename to plugins/loudmouth/loudmouth-account.cpp
diff --git a/lib/engine/components/loudmouth/loudmouth-account.h b/plugins/loudmouth/loudmouth-account.h
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-account.h
rename to plugins/loudmouth/loudmouth-account.h
diff --git a/lib/engine/components/loudmouth/loudmouth-bank.cpp b/plugins/loudmouth/loudmouth-bank.cpp
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-bank.cpp
rename to plugins/loudmouth/loudmouth-bank.cpp
diff --git a/lib/engine/components/loudmouth/loudmouth-bank.h b/plugins/loudmouth/loudmouth-bank.h
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-bank.h
rename to plugins/loudmouth/loudmouth-bank.h
diff --git a/lib/engine/components/loudmouth/loudmouth-chat-simple.cpp b/plugins/loudmouth/loudmouth-chat-simple.cpp
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-chat-simple.cpp
rename to plugins/loudmouth/loudmouth-chat-simple.cpp
diff --git a/lib/engine/components/loudmouth/loudmouth-chat-simple.h b/plugins/loudmouth/loudmouth-chat-simple.h
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-chat-simple.h
rename to plugins/loudmouth/loudmouth-chat-simple.h
diff --git a/lib/engine/components/loudmouth/loudmouth-cluster.cpp b/plugins/loudmouth/loudmouth-cluster.cpp
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-cluster.cpp
rename to plugins/loudmouth/loudmouth-cluster.cpp
diff --git a/lib/engine/components/loudmouth/loudmouth-cluster.h b/plugins/loudmouth/loudmouth-cluster.h
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-cluster.h
rename to plugins/loudmouth/loudmouth-cluster.h
diff --git a/lib/engine/components/loudmouth/loudmouth-dialect.cpp b/plugins/loudmouth/loudmouth-dialect.cpp
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-dialect.cpp
rename to plugins/loudmouth/loudmouth-dialect.cpp
diff --git a/lib/engine/components/loudmouth/loudmouth-dialect.h b/plugins/loudmouth/loudmouth-dialect.h
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-dialect.h
rename to plugins/loudmouth/loudmouth-dialect.h
diff --git a/lib/engine/components/loudmouth/loudmouth-heap.cpp b/plugins/loudmouth/loudmouth-heap.cpp
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-heap.cpp
rename to plugins/loudmouth/loudmouth-heap.cpp
diff --git a/lib/engine/components/loudmouth/loudmouth-heap.h b/plugins/loudmouth/loudmouth-heap.h
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-heap.h
rename to plugins/loudmouth/loudmouth-heap.h
diff --git a/lib/engine/components/loudmouth/loudmouth-main.cpp b/plugins/loudmouth/loudmouth-main.cpp
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-main.cpp
rename to plugins/loudmouth/loudmouth-main.cpp
diff --git a/lib/engine/components/loudmouth/loudmouth-main.h b/plugins/loudmouth/loudmouth-main.h
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-main.h
rename to plugins/loudmouth/loudmouth-main.h
diff --git a/lib/engine/components/loudmouth/loudmouth-presentity.cpp b/plugins/loudmouth/loudmouth-presentity.cpp
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-presentity.cpp
rename to plugins/loudmouth/loudmouth-presentity.cpp
diff --git a/lib/engine/components/loudmouth/loudmouth-presentity.h b/plugins/loudmouth/loudmouth-presentity.h
similarity index 100%
rename from lib/engine/components/loudmouth/loudmouth-presentity.h
rename to plugins/loudmouth/loudmouth-presentity.h
diff --git a/lib/engine/components/resource-list/Makefile.am b/plugins/resource-list/Makefile.am
similarity index 82%
rename from lib/engine/components/resource-list/Makefile.am
rename to plugins/resource-list/Makefile.am
index 68867be..dcc2119 100644
--- a/lib/engine/components/resource-list/Makefile.am
+++ b/plugins/resource-list/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmresource_list.la
 
-resource_list_dir = $(top_srcdir)/lib/engine/components/resource-list/
+resource_list_dir = $(top_srcdir)/plugins/resource-list/
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
 
@@ -9,7 +9,7 @@ INCLUDES = 						\
 	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/presence	\
 	-I$(top_srcdir)/lib/engine/account		\
-	-I$(top_srcdir)/lib/engine/components/xcap
+	-I$(top_srcdir)/plugins/xcap
 
 libgmresource_list_la_SOURCES = \
 	$(resource_list_dir)/resource-list-main.h \
@@ -28,8 +28,8 @@ libgmresource_list_la_SOURCES = \
 	$(resource_list_dir)/rl-cluster.cpp
 
 libgmresource_list_la_LDFLAGS = \
-	-L$(top_builddir)/lib/engine/components/xcap \
+	-L$(top_builddir)/plugins/xcap \
 	$(PLUGINS_LIBTOOL_FLAGS)
 libgmresource_list_la_LIBADD = \
-	$(top_builddir)/lib/engine/components/xcap/libgmxcap.la \
+	$(top_builddir)/plugins/xcap/libgmxcap.la \
 	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/lib/engine/components/resource-list/resource-list-main.cpp b/plugins/resource-list/resource-list-main.cpp
similarity index 100%
rename from lib/engine/components/resource-list/resource-list-main.cpp
rename to plugins/resource-list/resource-list-main.cpp
diff --git a/lib/engine/components/resource-list/resource-list-main.h b/plugins/resource-list/resource-list-main.h
similarity index 100%
rename from lib/engine/components/resource-list/resource-list-main.h
rename to plugins/resource-list/resource-list-main.h
diff --git a/lib/engine/components/resource-list/rl-cluster.cpp b/plugins/resource-list/rl-cluster.cpp
similarity index 100%
rename from lib/engine/components/resource-list/rl-cluster.cpp
rename to plugins/resource-list/rl-cluster.cpp
diff --git a/lib/engine/components/resource-list/rl-cluster.h b/plugins/resource-list/rl-cluster.h
similarity index 100%
rename from lib/engine/components/resource-list/rl-cluster.h
rename to plugins/resource-list/rl-cluster.h
diff --git a/lib/engine/components/resource-list/rl-entry-ref.cpp b/plugins/resource-list/rl-entry-ref.cpp
similarity index 100%
rename from lib/engine/components/resource-list/rl-entry-ref.cpp
rename to plugins/resource-list/rl-entry-ref.cpp
diff --git a/lib/engine/components/resource-list/rl-entry-ref.h b/plugins/resource-list/rl-entry-ref.h
similarity index 100%
rename from lib/engine/components/resource-list/rl-entry-ref.h
rename to plugins/resource-list/rl-entry-ref.h
diff --git a/lib/engine/components/resource-list/rl-entry.cpp b/plugins/resource-list/rl-entry.cpp
similarity index 100%
rename from lib/engine/components/resource-list/rl-entry.cpp
rename to plugins/resource-list/rl-entry.cpp
diff --git a/lib/engine/components/resource-list/rl-entry.h b/plugins/resource-list/rl-entry.h
similarity index 100%
rename from lib/engine/components/resource-list/rl-entry.h
rename to plugins/resource-list/rl-entry.h
diff --git a/lib/engine/components/resource-list/rl-heap.cpp b/plugins/resource-list/rl-heap.cpp
similarity index 100%
rename from lib/engine/components/resource-list/rl-heap.cpp
rename to plugins/resource-list/rl-heap.cpp
diff --git a/lib/engine/components/resource-list/rl-heap.h b/plugins/resource-list/rl-heap.h
similarity index 100%
rename from lib/engine/components/resource-list/rl-heap.h
rename to plugins/resource-list/rl-heap.h
diff --git a/lib/engine/components/resource-list/rl-list.cpp b/plugins/resource-list/rl-list.cpp
similarity index 100%
rename from lib/engine/components/resource-list/rl-list.cpp
rename to plugins/resource-list/rl-list.cpp
diff --git a/lib/engine/components/resource-list/rl-list.h b/plugins/resource-list/rl-list.h
similarity index 100%
rename from lib/engine/components/resource-list/rl-list.h
rename to plugins/resource-list/rl-list.h
diff --git a/lib/engine/components/resource-list/rl-presentity.cpp b/plugins/resource-list/rl-presentity.cpp
similarity index 100%
rename from lib/engine/components/resource-list/rl-presentity.cpp
rename to plugins/resource-list/rl-presentity.cpp
diff --git a/lib/engine/components/resource-list/rl-presentity.h b/plugins/resource-list/rl-presentity.h
similarity index 100%
rename from lib/engine/components/resource-list/rl-presentity.h
rename to plugins/resource-list/rl-presentity.h
diff --git a/lib/engine/components/xcap/Makefile.am b/plugins/xcap/Makefile.am
similarity index 89%
rename from lib/engine/components/xcap/Makefile.am
rename to plugins/xcap/Makefile.am
index 7c72025..2d5f1e3 100644
--- a/lib/engine/components/xcap/Makefile.am
+++ b/plugins/xcap/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmxcap.la
 
-xcap_dir = $(top_srcdir)/lib/engine/components/xcap/
+xcap_dir = $(top_srcdir)/plugins/xcap/
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SIGC_CFLAGS) $(SOUP_CFLAGS)
 
diff --git a/lib/engine/components/xcap/xcap-core.cpp b/plugins/xcap/xcap-core.cpp
similarity index 100%
rename from lib/engine/components/xcap/xcap-core.cpp
rename to plugins/xcap/xcap-core.cpp
diff --git a/lib/engine/components/xcap/xcap-core.h b/plugins/xcap/xcap-core.h
similarity index 100%
rename from lib/engine/components/xcap/xcap-core.h
rename to plugins/xcap/xcap-core.h
diff --git a/lib/engine/components/xcap/xcap-main.cpp b/plugins/xcap/xcap-main.cpp
similarity index 100%
rename from lib/engine/components/xcap/xcap-main.cpp
rename to plugins/xcap/xcap-main.cpp
diff --git a/lib/engine/components/xcap/xcap-main.h b/plugins/xcap/xcap-main.h
similarity index 100%
rename from lib/engine/components/xcap/xcap-main.h
rename to plugins/xcap/xcap-main.h
diff --git a/lib/engine/components/xcap/xcap-path.cpp b/plugins/xcap/xcap-path.cpp
similarity index 100%
rename from lib/engine/components/xcap/xcap-path.cpp
rename to plugins/xcap/xcap-path.cpp
diff --git a/lib/engine/components/xcap/xcap-path.h b/plugins/xcap/xcap-path.h
similarity index 100%
rename from lib/engine/components/xcap/xcap-path.h
rename to plugins/xcap/xcap-path.h
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]