GNOME.org
 

[evolution-kolab] Bug #669699 - Building on 64bit harder to do

commit 2339b24e1179835f9a81c1a05fc07dfefacf3ad1
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Feb 9 13:17:58 2012 +0100

    Bug #669699 - Building on 64bit harder to do
    
    * this fixes numerous issues with the build system
      (huge thanks to Milan Crha for the patch!)
    * had to change the gtk-doc dependency back to 1.14,
      since 1.9 does not yet support '--no-templ'
    * removed the Makefile.am's from the tests/ directories,
      which had beed excluded in configure.ac by the patch

 .gitignore                                       |   19 ++-
 Doxyfile                                         |    4 +-
 Makefile.am                                      |   34 ++--
 autogen.sh                                       |  175 +------------
 configure.ac                                     |  282 ++++++++++++----------
 docs/Makefile.am                                 |    3 +-
 docs/reference/Makefile.am                       |    6 +-
 m4/evo_krb5_support.m4                           |  136 +++++++++++
 src/Makefile.am                                  |   45 ++--
 src/addressbook/Makefile.am                      |   60 ++---
 src/addressbook/tests/Makefile.am                |    8 -
 src/calendar/Makefile.am                         |   69 ++----
 src/calendar/tests/Makefile.am                   |    8 -
 src/camel/Makefile.am                            |   69 ++----
 src/camel/camel-kolab-session.c                  |    4 +-
 src/camel/providers/Makefile.am                  |   16 +-
 src/camel/tests/Makefile.am                      |    8 -
 src/eplugin/Makefile.am                          |   81 ++-----
 src/eplugin/tests/Makefile.am                    |    8 -
 src/libekolab/Makefile.am                        |  176 ++++++--------
 src/libekolab/tests/Makefile.am                  |    8 -
 src/libekolabconv/Makefile.am                    |    5 +-
 src/libekolabconv/main/Makefile.am               |    7 +-
 src/libekolabconv/main/src/Makefile.am           |   65 +++---
 src/libekolabconv/main/src/evolution/Makefile.am |   42 ++--
 src/libekolabconv/main/src/kolab/Makefile.am     |   45 ++---
 src/libekolabconv/main/src/structs/Makefile.am   |   45 ++---
 src/libekolabutil/Makefile.am                    |  108 ++++-----
 src/libekolabutil/kolab-util-ldap.c              |    1 -
 src/tests/Makefile.am                            |   56 ++---
 src/tests/integration/Makefile.am                |   13 +-
 src/tests/integration/libcamelkolab/Makefile.am  |   36 +--
 src/tests/integration/libekolab/Makefile.am      |  126 ++++------
 33 files changed, 764 insertions(+), 1004 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac88639..9650a43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,26 +38,43 @@ libtool
 ltmain.sh
 Makefile
 Makefile.in
+m4/gtk-doc.m4
+m4/intltool.m4
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
 missing
 mkinstalldirs
 .nautilus-metafile.xml
 *.o
 /po/POTFILES
 /po/stamp-it
+/po/*.gmo
 prepare.sh
 .project
 *.pws
 *.pyc
 /src/evolution_kolab
+/src/eplugin/org-gnome-kolab.eplug
 /src/libekolabconv/test/UnitTest
 /src/tests/tdriver
+/src/camel/providers/imapx/camel-imapx-extd-tokenise.h
+/src/camel/providers/imapx/camel-imapx-tokenise.h
+/src/camel/providers/imapx/test-imapx
+/src/libekolabconv/test/src/unittest-libekolabconv
+/src/tests/integration/libcamelkolab/camel-kolab-imapx-provider
+/src/tests/integration/libekolab/test-kolab-mail-access
+/src/tests/integration/libekolab/test-kolab-util-cal-freebusy
+/src/tests/integration/libekolab/test-kolab-util-http
+/src/tests/integration/libekolab/test-kolab-util-ldap
 stamp-h*
 *.supp
 .*swp
 tags
 test.log
 .tm_project*
-m4/
 gtk-doc.make
 TODO.tasks
 docs/uml/*.uml
diff --git a/Doxyfile b/Doxyfile
index 386b384..984fea1 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,14 +31,14 @@ PROJECT_NAME           = evolution-kolab
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 3.3.5
+PROJECT_NUMBER         = 3.3.90
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ./doc/api
+OUTPUT_DIRECTORY       = ./docs/doxygen-apidocs
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
diff --git a/Makefile.am b/Makefile.am
index e723927..71cf919 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,27 @@
-## Process this file with automake to produce Makefile.in
-## Created by Anjuta
-
 ACLOCAL_AMFLAGS=-I m4
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-krb5=/usr
 
-SUBDIRS = src po \
-	docs
+SUBDIRS = src po docs
 
 evolution_kolabdocdir = ${prefix}/doc/evolution_kolab
-evolution_kolabdoc_DATA = \
-	README\
-	COPYING\
-	AUTHORS\
-	ChangeLog\
-	INSTALL\
+evolution_kolabdoc_DATA =	\
+	README			\
+	COPYING			\
+	AUTHORS			\
+	ChangeLog		\
+	INSTALL			\
 	NEWS 
 
-
-INTLTOOL_FILES = intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in
+CLEANFILES = 	intltool-merge	\
+		intltool-update	\
+		intltool-extract
 
 EXTRA_DIST = $(evolution_kolabdoc_DATA) \
-	$(INTLTOOL_FILES)\
+	intltool-merge.in		\
+	intltool-update.in		\
+	intltool-extract.in		\
+	eplugin-rule.mk			\
 	evolution-kolab.doap
 
 DISTCLEANFILES = intltool-extract \
@@ -35,3 +33,5 @@ DISTCLEANFILES = intltool-extract \
 # Remove doc directory on uninstall
 uninstall-local:
 	-rm -r $(evolution_kolabdocdir)
+
+-include $(top_srcdir)/git.mk
diff --git a/autogen.sh b/autogen.sh
index 0d5aa4a..57cdfef 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,169 +4,22 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-DIE=0
-
-if [ -n "$GNOME2_DIR" ]; then
-	ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
-	LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
-	PATH="$GNOME2_DIR/bin:$PATH"
-	export PATH
-	export LD_LIBRARY_PATH
-fi
-
-(test -f $srcdir/configure.ac) || {
+PKG_NAME="evolution-kolab"
+REQUIRED_AUTOCONF_VERSION=2.58
+REQUIRED_AUTOMAKE_VERSION=1.9
+REQUIRED_LIBTOOL_VERSION=1.5
+REQUIRED_INTLTOOL_VERSION=0.35.5
+
+(test -f $srcdir/configure.ac \
+  && test -f $srcdir/ChangeLog \
+  && test -d $srcdir/src/eplugin) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level package directory"
+    echo " top-level $PKG_NAME directory"
     exit 1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`autoconf' installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/";
-  DIE=1
-}
-
-(grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo 
-    echo "**Error**: You must have \`intltool' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/";
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && {
-  (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`xml-i18n-toolize' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/";
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`libtool' installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/";
-    DIE=1
-  }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && {
-  (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
-  (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`glib' installed."
-    echo "You can get it from: ftp://ftp.gtk.org/pub/gtk";
-    DIE=1
-  }
-}
-
-(grep "^GTK_DOC_CHECK" $srcdir/configure.ac >/dev/null) && {
-  (gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`gtk-doc' installed."
-    echo "You can get it from: ftp://ftp.gnome.org/pub/GNOME/sources/gtk-doc/";
-    DIE=1
-  }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`automake' installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/";
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/";
-  DIE=1
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME git"
+    exit 1
 }
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    ( cd $dr
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running glib-gettextize...  Ignore non-fatal messages."
-	echo "no" | glib-gettextize --force --copy
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then
-        echo "Running intltoolize..."
-	intltoolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
-        echo "Running xml-i18n-toolize..."
-	xml-i18n-toolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      if grep "^GTK_DOC_CHECK" configure.ac >/dev/null; then
-        echo "Running gtkdocize ..."
-        gtkdocize --copy
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^A[CM]_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
-      echo "Running autoconf ..."
-      autoconf
-    )
-  fi
-done
-
-conf_flags="--enable-maintainer-mode"
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile. || exit 1
-else
-  echo Skipping configure process.
-fi
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 500539d..2a30a54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,104 +1,97 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl Created by Anjuta application wizard.
+dnl Simple configuration script for evolution-kolab evolution plugin
 
-AC_INIT([evolution-kolab], [3.3.90], , ,[https://live.gnome.org/Evolution/Kolab])
+AC_PREREQ(2.58)
+AC_INIT([evolution-kolab], [3.3.90], [https://live.gnome.org/Evolution/Kolab])
+AM_INIT_AUTOMAKE([gnu 1.9 dist-xz no-dist-gzip tar-ustar])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-dnl ------------ upstream ------------
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl This number is meaningless, but we're now stuck with it in our
 dnl library names for backward compatibility.
 m4_define([api_version], [1.2])
-
 AC_SUBST([API_VERSION],[api_version])
 AC_DEFINE_UNQUOTED(API_VERSION, ["$API_VERSION"], [API version (Major.Minor)])
 
-PKG_PROG_PKG_CONFIG
-
 dnl *******************
-dnl Special directories
+dnl Required Packages
 dnl *******************
-plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-3.0`
-AC_SUBST(plugindir)
-
-ebook_backenddir=`$PKG_CONFIG --variable=backenddir libedata-book-1.2`
-AC_SUBST(ebook_backenddir)
-
-ecal_backenddir=`$PKG_CONFIG --variable=backenddir libedata-cal-1.2`
-AC_SUBST(ecal_backenddir)
-
-camel_providerdir=`$PKG_CONFIG --variable=camel_providerdir camel-1.2`
-AC_SUBST(camel_providerdir) 
-
-dnl ------------ /upstream -----------
-
-KOLAB_LIB_EKOLABUTIL="\$(top_builddir)/src/libekolabutil/libekolabutil.la"
-AC_SUBST(KOLAB_LIB_EKOLABUTIL)
-
-KOLAB_LIB_EKOLABBACKEND="\$(top_builddir)/src/libekolab/libekolabbackend.la"
-AC_SUBST(KOLAB_LIB_EKOLABBACKEND)
-
-KOLAB_LIB_EPLUGIN="\$(top_builddir)/src/eplugin/liborg-gnome-kolab.la"
-AC_SUBST(KOLAB_LIB_EPLUGIN)
-
-KOLAB_LIB_CAMEL_IMAPX="\$(top_builddir)/src/camel/providers/imapx/libcamelimapx.la"
-AC_SUBST(KOLAB_LIB_CAMEL_IMAPX)
-
-KOLAB_LIB_EKOLABCONVEVOLUTION="\$(top_builddir)/src/libekolabconv/main/src/evolution/libekolabconvevolution.la"
-AC_SUBST(KOLAB_LIB_EKOLABCONVEVOLUTION)
-
-KOLAB_LIB_EKOLABCONVKOLAB="\$(top_builddir)/src/libekolabconv/main/src/kolab/libekolabconvkolab.la"
-AC_SUBST(KOLAB_LIB_EKOLABCONVKOLAB)
-
-KOLAB_LIB_EKOLABCONVSTRUCTS="\$(top_builddir)/src/libekolabconv/main/src/structs/libekolabconvstructs.la"
-AC_SUBST(KOLAB_LIB_EKOLABCONVSTRUCTS)
-
-KOLAB_LIB_EKOLABCONV="\$(top_builddir)/src/libekolabconv/main/src/libekolabconv.la"
-AC_SUBST(KOLAB_LIB_EKOLABCONV)
-
-KOLAB_LIB_EKOLAB="\$(top_builddir)/src/libekolab/libekolab.la"
-AC_SUBST(KOLAB_LIB_EKOLAB)
-
-KOLAB_LIB_CAMEL="\$(top_builddir)/src/camel/libcamelkolab.la"
-AC_SUBST(KOLAB_LIB_CAMEL)
+m4_define([eds_minimum_version], [ema_version])
+m4_define([evo_minimum_version], [ema_version])
+m4_define([libmapi_minimum_version], [0.11])
+m4_define([glib_minimum_version], [2.16.1])
+m4_define([gtk_minimum_version], [2.99.2])
+m4_define([gconf_minimum_version], [2.0.0])
+
+dnl ****************************
+dnl Initialize maintainer mode
+dnl ****************************
+AM_MAINTAINER_MODE
 
-KOLAB_LIB_CAL="\$(top_builddir)/src/calendar/libecalbackendkolab.la"
-AC_SUBST(KOLAB_LIB_CAL)
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+
+dnl ************
+dnl i18n stuff
+dnl ************
+IT_PROG_INTLTOOL([0.35.5])
+AM_GLIB_GNU_GETTEXT
 
-KOLAB_LIB_BOOK="\$(top_builddir)/src/addressbook/libebookbackendkolab.la"
-AC_SUBST(KOLAB_LIB_BOOK)
+GETTEXT_PACKAGE=evolution_kolab
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 
-KOLAB_INCLUDE="-I\$(top_srcdir)/src -I\$(top_builddir)/src"
-AC_SUBST(KOLAB_INCLUDE)
+localedir='$(prefix)/$(DATADIRNAME)/locale'
+AC_SUBST(localedir)
 
-KOLAB_INCLUDE_EKOLABCONV="-I\$(top_srcdir)/src/libekolabconv/main/src -I\$(top_builddir)/src/libekolabconv/main/src"
-AC_SUBST(KOLAB_INCLUDE_EKOLABCONV)
+dnl ****************************
+dnl Initialize libtool
+dnl ****************************
+AM_DISABLE_STATIC
+AC_PROG_LIBTOOL
 
-CFLAGS="$CFLAGS $LARGEFILE_CFLAGS -fPIC"
-AC_SUBST(CFLAGS)
+PKG_PROG_PKG_CONFIG
 
-ADD_CFLAGS="-std=c99 -pedantic -Wall -Wextra -Wcast-align -Wredundant-decls -Wconversion -Wbad-function-cast -Wundef -Wfloat-equal -Wswitch-default -Wmissing-include-dirs -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-AC_SUBST(ADD_CFLAGS)
+dnl *****************************
+dnl Check for GNOME Platform
+dnl *****************************
+PKG_CHECK_MODULES(GNOME_PLATFORM,
+	[glib-2.0 >= glib_minimum_version
+	gtk+-3.0 >= gtk_minimum_version
+	gconf-2.0 >= gconf_minimum_version])
+
+dnl ********************************
+dnl Check for evolution-data-server 
+dnl ********************************
+PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0)
+PKG_CHECK_MODULES(EDS, libedata-book-1.2 libedata-cal-1.2 libedataserver-1.2 libical libedataserverui-3.0 libebackend-1.2)
+PKG_CHECK_MODULES(SQLITE, sqlite3)
+PKG_CHECK_MODULES(CAMEL, camel-1.2)
+PKG_CHECK_MODULES(GTK, gtk+-3.0)
+PKG_CHECK_MODULES(SOUP, libsoup-2.4 libsoup-gnome-2.4)
+PKG_CHECK_MODULES(CURL, libcurl)
+PKG_CHECK_MODULES(ICAL, libical)
+PKG_CHECK_MODULES(GMIME, gmime-2.4)
+PKG_CHECK_MODULES(EVOLUTION, evolution-plugin-3.0 libebook-1.2 libecal-1.2)
 
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+dnl ***********
+dnl Kerberos 5
+dnl ***********
+EVO_KRB5_SUPPORT(no)
 
-AM_INIT_AUTOMAKE([gnu 1.9 dist-xz no-dist-gzip tar-ustar])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
+NSS_CFLAGS=$KRB5_CFLAGS $MANUAL_NSS_CFLAGS
+NSS_LIBS=$KRB5_LIBS $MANUAL_NSS_LIBS
+AC_SUBST(NSS_CFLAGS)
+AC_SUBST(NSS_LIBS)
 
-
-dnl ******************************
-dnl Initialize maintainer mode
-dnl ******************************
-AM_MAINTAINER_MODE
-
-AC_ISC_POSIX
-AC_PROG_CC
-AM_PROG_CC_STDC
-AM_PROG_CC_C_O
-AC_HEADER_STDC
-
-
-dnl ------------ upstream ------------
+dnl ****************************
+dnl Check for evolution plugins 
+dnl ****************************
+PKG_CHECK_MODULES(EVOLUTION_PLUGIN, evolution-plugin-3.0 >= evo_minimum_version)
 
 dnl ******************************
 dnl Checks for large file support
@@ -154,74 +147,116 @@ fi
 
 AM_CONDITIONAL(ENABLE_LARGEFILE, [test "x$enable_largefile" = "xyes"])
 
+dnl ******************************
+dnl gperf stuff
+dnl ******************************
+AC_PATH_PROG(GPERF, gperf, [no])
+if test "x$GPERF" = "xno"; then
+  AC_MSG_ERROR([You need gperf to build evolution-kolab])
+fi
+
+dnl ****************************
+dnl Expose version information
+dnl ****************************
+API_VERSION=$EDS_PACKAGE
+AC_SUBST(API_VERSION)
+
+EDS_REQUIRED=eds_minimum_version
+AC_SUBST(EDS_REQUIRED)
+
+EVO_REQUIRED=evo_minimum_version
+AC_SUBST(EVO_REQUIRED)
+
+LIBMAPI_REQUIRED=libmapi_minimum_version
+AC_SUBST(LIBMAPI_REQUIRED)
+
 dnl *******************************
 dnl Add evolution plugin rules here
 dnl *******************************
 EVO_PLUGIN_RULE=$srcdir/eplugin-rule.mk
 AC_SUBST_FILE(EVO_PLUGIN_RULE)
 
-dnl ------------ /upstream -----------
+dnl *******************
+dnl Special directories
+dnl *******************
+plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-3.0`
+AC_SUBST(plugindir)
 
+ebook_backenddir=`$PKG_CONFIG --variable=backenddir libedata-book-1.2`
+AC_SUBST(ebook_backenddir)
 
-dnl ******************************
-dnl gperf stuff
-dnl ******************************
-AC_PATH_PROG(GPERF, gperf, [no])
-if test "x$GPERF" = "xno"; then
-  AC_MSG_ERROR([You need gperf to build evolution-kolab])
-fi
+ecal_backenddir=`$PKG_CONFIG --variable=backenddir libedata-cal-1.2`
+AC_SUBST(ecal_backenddir)
 
+camel_providerdir=`$PKG_CONFIG --variable=camel_providerdir camel-1.2`
+AC_SUBST(camel_providerdir) 
 
-dnl ***************************************************************************
-dnl Internatinalization
-dnl ***************************************************************************
-GETTEXT_PACKAGE=evolution_kolab
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
-AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
+KOLAB_LIB_EKOLABUTIL="\$(top_builddir)/src/libekolabutil/libekolabutil.la"
+AC_SUBST(KOLAB_LIB_EKOLABUTIL)
 
+KOLAB_LIB_EKOLABBACKEND="\$(top_builddir)/src/libekolab/libekolabbackend.la"
+AC_SUBST(KOLAB_LIB_EKOLABBACKEND)
 
-dnl ******************************
-dnl utilize libtool
-dnl ******************************
-AM_PROG_LIBTOOL
+KOLAB_LIB_EPLUGIN="\$(top_builddir)/src/eplugin/liborg-gnome-kolab.la"
+AC_SUBST(KOLAB_LIB_EPLUGIN)
+
+KOLAB_LIB_CAMEL_IMAPX="\$(top_builddir)/src/camel/providers/imapx/libcamelimapx.la"
+AC_SUBST(KOLAB_LIB_CAMEL_IMAPX)
 
+KOLAB_LIB_EKOLABCONVEVOLUTION="\$(top_builddir)/src/libekolabconv/main/src/evolution/libekolabconvevolution.la"
+AC_SUBST(KOLAB_LIB_EKOLABCONVEVOLUTION)
 
-dnl ******************************************************
-dnl Gtk Doc stuff
-dnl (AM_PROG_LIBTOOL must precede this if libtool is used)
-dnl ******************************************************
-GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+KOLAB_LIB_EKOLABCONVKOLAB="\$(top_builddir)/src/libekolabconv/main/src/kolab/libekolabconvkolab.la"
+AC_SUBST(KOLAB_LIB_EKOLABCONVKOLAB)
 
+KOLAB_LIB_EKOLABCONVSTRUCTS="\$(top_builddir)/src/libekolabconv/main/src/structs/libekolabconvstructs.la"
+AC_SUBST(KOLAB_LIB_EKOLABCONVSTRUCTS)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0)
-PKG_CHECK_MODULES(EDS, libedata-book-1.2 libedata-cal-1.2 libedataserver-1.2 libical libedataserverui-3.0 libebackend-1.2)
-PKG_CHECK_MODULES(SQLITE, sqlite3)
-PKG_CHECK_MODULES(CAMEL, camel-1.2 libedataserverui-3.0)
-PKG_CHECK_MODULES(GTK, gtk+-3.0)
-PKG_CHECK_MODULES(SOUP, libsoup-2.4 libsoup-gnome-2.4)
-PKG_CHECK_MODULES(CURL, libcurl)
-PKG_CHECK_MODULES(NSS, nspr nss, [AC_DEFINE([HAVE_SSL], [], [Have SSL library])])
-PKG_CHECK_MODULES(ICAL, libical)
-PKG_CHECK_MODULES(GMIME, gmime-2.4)
-PKG_CHECK_MODULES(EVOLUTION, evolution-plugin-3.0 libebook-1.2 libecal-1.2)
+KOLAB_LIB_EKOLABCONV="\$(top_builddir)/src/libekolabconv/main/src/libekolabconv.la"
+AC_SUBST(KOLAB_LIB_EKOLABCONV)
+
+KOLAB_LIB_EKOLAB="\$(top_builddir)/src/libekolab/libekolab.la"
+AC_SUBST(KOLAB_LIB_EKOLAB)
+
+KOLAB_LIB_CAMEL="\$(top_builddir)/src/camel/libcamelkolab.la"
+AC_SUBST(KOLAB_LIB_CAMEL)
+
+KOLAB_LIB_CAL="\$(top_builddir)/src/calendar/libecalbackendkolab.la"
+AC_SUBST(KOLAB_LIB_CAL)
+
+KOLAB_LIB_BOOK="\$(top_builddir)/src/addressbook/libebookbackendkolab.la"
+AC_SUBST(KOLAB_LIB_BOOK)
+
+KOLAB_INCLUDE="-I\$(top_srcdir)/src -I\$(top_builddir)/src"
+AC_SUBST(KOLAB_INCLUDE)
+
+KOLAB_INCLUDE_EKOLABCONV="-I\$(top_srcdir)/src/libekolabconv/main/src -I\$(top_builddir)/src/libekolabconv/main/src"
+AC_SUBST(KOLAB_INCLUDE_EKOLABCONV)
+
+CFLAGS="$CFLAGS $LARGEFILE_CFLAGS"
+AC_SUBST(CFLAGS)
+
+ADD_CFLAGS="-std=c99 -pedantic -Wall -Wextra -Wcast-align -Wredundant-decls -Wconversion -Wbad-function-cast -Wundef -Wfloat-equal -Wswitch-default -Wmissing-include-dirs -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+AC_SUBST(ADD_CFLAGS)
+
+dnl *************
+dnl Gtk Doc stuff
+dnl *************
+GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
 
-AC_OUTPUT([
+dnl **************************
+dnl Makefiles, generated .pc's
+dnl **************************
+AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/addressbook/Makefile
-src/addressbook/tests/Makefile
 src/calendar/Makefile
-src/calendar/tests/Makefile
 src/camel/Makefile
 src/camel/providers/Makefile
 src/camel/providers/imapx/Makefile
-src/camel/tests/Makefile
 src/eplugin/Makefile
-src/eplugin/tests/Makefile
 src/libekolab/Makefile
-src/libekolab/tests/Makefile
 src/libekolabconv/Makefile
 src/libekolabconv/main/Makefile
 src/libekolabconv/main/src/Makefile
@@ -245,3 +280,4 @@ docs/reference/eplugin/Makefile
 docs/reference/libekolab/Makefile
 docs/reference/libekolabconv/Makefile
 ])
+AC_OUTPUT
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2236afd..f351d21 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,8 +1,7 @@
+## Process this file with automake to produce Makefile.in
 
 SUBDIRS = \
 	reference
 
 -include $(top_srcdir)/git.mk
 
-## File created by the gnome-build tools
-
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f967bac..b24f5cd 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,3 +1,4 @@
+## Process this file with automake to produce Makefile.in
 
 SUBDIRS = \
 	addressbook\
@@ -7,7 +8,6 @@ SUBDIRS = \
 	libekolab \
 	libekolabconv
 
--include $(top_srcdir)/git.mk
-
-## File created by the gnome-build tools
+MKDB_OPTIONS=--output-format=xml --name-space=ek
 
+-include $(top_srcdir)/git.mk
diff --git a/m4/evo_krb5_support.m4 b/m4/evo_krb5_support.m4
new file mode 100644
index 0000000..ba37e81
--- /dev/null
+++ b/m4/evo_krb5_support.m4
@@ -0,0 +1,136 @@
+dnl EVO_KRB5_SUPPORT(default)
+dnl Add --with-krb5, --with-krb5-libs and --with-krb5-include options.
+dnl --with-krb5 defaults to the given value if not specified.
+#serial 0.2
+AC_DEFUN([EVO_KRB5_SUPPORT],[
+	dnl ******************************
+	dnl Kerberos
+	dnl ******************************
+	default="$1"
+	AC_ARG_WITH([krb5],
+		AS_HELP_STRING([--with-krb5=PATH],
+		[Location of Kerberos 5 install dir]))
+
+	AC_ARG_WITH([krb5-libs],
+		AS_HELP_STRING([--with-krb5-libs=PATH],
+		[Location of Kerberos 5 libraries]))
+
+	AC_ARG_WITH([krb5-includes],
+		AS_HELP_STRING([--with-krb5-includes=PATH],
+		[Location of Kerberos 5 headers]))
+
+	dnl ******************************
+	dnl Kerberos 5
+	dnl ******************************
+	msg_krb5="no"
+	AC_MSG_CHECKING([for Kerberos 5])
+	with_krb5="${with_krb5:=$default}"
+	case $with_krb5 in
+		no|"")
+			with_krb5=no
+			;;
+		yes)
+			with_krb5=/usr
+			;;
+		*)
+			with_krb5=$with_krb5
+			;;
+	esac
+
+	if test "x${with_krb5}" != "xno"; then
+		LIBS_save="$LIBS"
+
+		case $with_krb5_libs in
+			yes|no|"")
+				with_krb5_libs=$with_krb5/lib
+				;;
+			*)
+				with_krb5_libs=$with_krb5_libs
+				;;
+		esac
+
+		case $with_krb5_includes in
+			yes|no|"")
+				with_krb5_includes=$with_krb5/include
+				;;
+			*)
+				with_krb5_includes=$with_krb5_includes
+				;;
+		esac
+
+		mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+		heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+		sunlibs="-lkrb5 -lgss"
+		AC_CACHE_VAL([ac_cv_lib_kerberos5],
+		[
+			LIBS="$LIBS -L$with_krb5_libs $mitlibs"
+			AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])],
+			[ac_cv_lib_kerberos5="$mitlibs"],
+			[
+				LIBS="$LIBS_save -L$with_krb5_libs $heimlibs"
+				AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])],
+				[ac_cv_lib_kerberos5="$heimlibs"],
+				[
+					LIBS="$LIBS_save -L$with_krb5_libs $sunlibs"
+					AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])],
+					[ac_cv_lib_kerberos5="$sunlibs"], [ac_cv_lib_kerberos5="no"])
+				])
+			])
+			LIBS="$LIBS_save"
+		])
+		if test "$ac_cv_lib_kerberos5" != "no"; then
+			AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5])
+			if test "$ac_cv_lib_kerberos5" = "$mitlibs"; then
+				AC_DEFINE(HAVE_MIT_KRB5,1,[Define if you have MIT Krb5])
+				if test -z "$with_krb5_includes"; then
+					KRB5_CFLAGS="-I$with_krb5/include"
+				else
+					KRB5_CFLAGS="-I$with_krb5_includes"
+				fi
+				msg_krb5="yes (MIT)"
+			else
+				if test "$ac_cv_lib_kerberos5" = "$heimlibs"; then
+					AC_DEFINE(HAVE_HEIMDAL_KRB5,1,[Define if you have Heimdal])
+					if test -z "$with_krb5_includes"; then
+						KRB5_CFLAGS="-I$with_krb5/include/heimdal"
+					else
+						KRB5_CFLAGS="-I$with_krb5_includes"
+					fi
+					msg_krb5="yes (Heimdal)"
+				else
+					AC_DEFINE(HAVE_SUN_KRB5,1,[Define if you have Sun Kerberosv5])
+					if test -z "$with_krb5_includes"; then
+						KRB5_CFLAGS="-I$with_krb5/include/kerberosv5"
+					else
+						KRB5_CFLAGS="-I$with_krb5_includes"
+					fi
+					msg_krb5="yes (Sun)"
+				fi
+			fi
+			KRB5_LIBS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
+		else
+			AC_MSG_ERROR([You specified with krb5, but it was not found.])
+		fi
+	else
+		msg_krb5="no"
+	fi
+	AC_MSG_RESULT([$msg_krb5])
+
+	AM_CONDITIONAL(ENABLE_KRB5, [test "x$with_krb5" != "xno"])
+
+	AC_CHECK_HEADER([et/com_err.h],
+		[AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have <et/com_err.h>])],,
+		[[	#if HAVE_ET_COM_ERR_H
+			#include <com_err.h>
+			#endif
+		]])
+	AC_CHECK_HEADER([com_err.h],
+		[AC_DEFINE([HAVE_COM_ERR_H], 1, [Have <com_err.h>])],,
+		[[	#if HAVE_COM_ERR_H
+			#include <com_err.h>
+			#endif
+		]])
+
+	AC_SUBST(KRB5_CFLAGS)
+	AC_SUBST(KRB5_LIBS)
+])
diff --git a/src/Makefile.am b/src/Makefile.am
index 98443c0..49b56fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,41 +1,32 @@
 ## Process this file with automake to produce Makefile.in
 
-## Created by Anjuta
-
-AM_CPPFLAGS = \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	$(GLIB_CFLAGS)
-
-AM_CFLAGS =\
-	 -Wall\
-	 -g
+SUBDIRS =		\
+	libekolabconv	\
+	libekolabutil	\
+	camel		\
+	libekolab	\
+	addressbook	\
+	calendar	\
+	eplugin		\
+	tests
 
 bin_PROGRAMS = evolution_kolab
 
 evolution_kolab_SOURCES = \
 	main.c
 
-evolution_kolab_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE)
-
-evolution_kolab_CFLAGS = \
-	$(CFLAGS) \
+AM_CPPFLAGS = 					\
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"	\
+	-DPACKAGE_SRC_DIR=\"$(srcdir)\"		\
+	-DPACKAGE_DATA_DIR=\"$(datadir)\"	\
+	$(KOLAB_INCLUDE)			\
+	$(GLIB_CFLAGS)				\
+	$(CFLAGS)				\
 	$(ADD_CFLAGS)
 
-evolution_kolab_LDFLAGS = 
+evolution_kolab_LDFLAGS = $(NO_UNDEFINED)
 
 evolution_kolab_LDADD = \
 	$(GLIB_LIBS)
 
-SUBDIRS = \
-	libekolabconv \
-	libekolabutil \
-	camel \
-	libekolab \
-	addressbook \
-	calendar \
-	eplugin \
-	tests
+-include $(top_srcdir)/git.mk
diff --git a/src/addressbook/Makefile.am b/src/addressbook/Makefile.am
index 85d951e..02afad9 100644
--- a/src/addressbook/Makefile.am
+++ b/src/addressbook/Makefile.am
@@ -1,6 +1,8 @@
+## Process this file with automake to produce Makefile.in
 
-ebook_backend_LTLIBRARIES = \
-	libebookbackendkolab.la
+# SUBDIRS = tests
+
+ebook_backend_LTLIBRARIES = libebookbackendkolab.la
 
 libebookbackendkolab_la_SOURCES = \
 	e-book-backend-kolab.c   \
@@ -8,46 +10,26 @@ libebookbackendkolab_la_SOURCES = \
 	kolab-util-contact-cache.c   \
 	kolab-util-contact.c
 
-libebookbackendkolab_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE)
+noinst_HEADERS =			\
+	e-book-backend-kolab.h		\
+	kolab-util-contact-cache.h	\
+	kolab-util-contact.h
 
-libebookbackendkolab_la_CFLAGS = \
-	$(CFLAGS) \
+AM_CPPFLAGS =				\
+	$(GLIB_CFLAGS)			\
+	$(EDS_CFLAGS)			\
+	$(CAMEL_CFLAGS)			\
+	$(KOLAB_INCLUDE)		\
+	$(CFLAGS)			\
 	$(ADD_CFLAGS)
 
-libebookbackendkolab_la_LIBADD = \
-	$(EDS_LIBS) \
-	$(GLIB_LIBS) \
-	$(KOLAB_LIB_EKOLABBACKEND)
-
-libebookbackendkolab_la_LDFLAGS = \
-	-module                    \
-	-avoid-version
-
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(EDS_CFLAGS) \
-	$(CAMEL_CFLAGS)
-
-SUBDIRS = \
-	tests
+libebookbackendkolab_la_LDFLAGS = -module -avoid-version
 
-AM_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS) \
-	$(KOLAB_INCLUDE)
-
-noinst_HEADERS = \
-	e-book-backend-kolab.h\
-	kolab-util-contact-cache.h \
-	kolab-util-contact.h
-
-noinstdir = \
-	$(pkgincludedir)
-
-EXTRA_DIST = \
-	$(noinst_HEADERS)
+libebookbackendkolab_la_LIBADD =	\
+	$(EDS_LIBS)			\
+	$(GLIB_LIBS)			\
+	$(KOLAB_LIB_EKOLABBACKEND)
 
-## File created by the gnome-build tools
+EXTRA_DIST = $(noinst_HEADERS)
 
+-include $(top_srcdir)/git.mk
diff --git a/src/calendar/Makefile.am b/src/calendar/Makefile.am
index defbce1..2cfe811 100644
--- a/src/calendar/Makefile.am
+++ b/src/calendar/Makefile.am
@@ -1,54 +1,37 @@
+## Process this file with automake to produce Makefile.in
 
-ecal_backend_LTLIBRARIES = \
-	libecalbackendkolab.la
+# SUBDIRS = tests
 
-libecalbackendkolab_la_SOURCES = \
-	e-cal-backend-kolab.c   \
-	e-cal-backend-kolab-factory.c   \
-	kolab-util-calendar.c   \
+ecal_backend_LTLIBRARIES = libecalbackendkolab.la
+
+libecalbackendkolab_la_SOURCES =		\
+	e-cal-backend-kolab.c			\
+	e-cal-backend-kolab-factory.c		\
+	kolab-util-calendar.c			\
 	kolab-util-calendar-cache.c
 
-libecalbackendkolab_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE) \
-	$(NSS_CFLAGS)
+noinst_HEADERS =				\
+	e-cal-backend-kolab.h			\
+	kolab-util-calendar.h			\
+	kolab-util-calendar-cache.h
 
-libecalbackendkolab_la_CFLAGS = \
-	$(CFLAGS) \
+AM_CPPFLAGS =					\
+	$(GLIB_CFLAGS)				\
+	$(EDS_CFLAGS)				\
+	$(KOLAB_INCLUDE)			\
+	$(NSS_CFLAGS)				\
+	$(CFLAGS)				\
 	$(ADD_CFLAGS)
 
-libecalbackendkolab_la_LDFLAGS = \
-	-module \
-	-avoid-version
+libecalbackendkolab_la_LDFLAGS = -module -avoid-version
 
-libecalbackendkolab_la_LIBADD =             \
-	$(GLIB_LIBS)             \
-	$(EDS_LIBS)             \
-	$(KOLAB_LIB_EKOLABCONV)             \
-	$(KOLAB_LIB_EKOLABBACKEND)             \
+libecalbackendkolab_la_LIBADD =			\
+	$(GLIB_LIBS)				\
+	$(EDS_LIBS)				\
+	$(KOLAB_LIB_EKOLABCONV)			\
+	$(KOLAB_LIB_EKOLABBACKEND)		\
 	$(NSS_LIBS)
 
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS)\
-	$(EDS_CFLAGS)
-
-SUBDIRS = \
-	tests
-
-AM_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS) \
-	$(KOLAB_INCLUDE)
-
-noinst_HEADERS = \
-	e-cal-backend-kolab.h \
-	kolab-util-calendar.h \
-	kolab-util-calendar-cache.h
-
-noinstdir = \
-	$(pkgincludedir)
-
-EXTRA_DIST = \
-	$(noinst_HEADERS)
+EXTRA_DIST = $(noinst_HEADERS)
 
-## File created by the gnome-build tools
+-include $(top_srcdir)/git.mk
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index f0a7658..0d7fb93 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -1,3 +1,7 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = providers
+
 camel_provider_LTLIBRARIES = libcamelkolab.la
 camel_provider_DATA = libcamelkolab.urls
 
@@ -13,23 +17,31 @@ libcamelkolab_la_SOURCES =			\
 	camel-kolab-session.c			\
 	camel-kolab-stream.c
 
-libcamelkolab_la_CPPFLAGS =			\
-	$(AM_CPPFLAGS)				\
-	$(SQLITE_CFLAGS)			\
-	$(NSS_CFLAGS)				\
-	$(KOLAB_INCLUDE)			\
-	-DG_LOG_DOMAIN=\"camel-kolab\"
+noinst_HEADERS =				\
+	camel-kolab-imapx-conn-manager.h	\
+	camel-kolab-imapx-folder.h		\
+	camel-kolab-imapx-metadata-db.h		\
+	camel-kolab-imapx-metadata.h		\
+	camel-kolab-imapx-provider.h		\
+	camel-kolab-imapx-server.h		\
+	camel-kolab-imapx-settings.h		\
+	camel-kolab-imapx-store.h		\
+	camel-kolab-session.h			\
+	camel-kolab-stream.h
 
-libcamelkolab_la_CFLAGS =			\
+AM_CPPFLAGS =					\
+	-DG_LOG_DOMAIN=\"camel-kolab\"		\
 	$(CFLAGS)				\
 	$(ADD_CFLAGS)				\
 	$(SQLITE_CFLAGS)			\
 	$(NSS_CFLAGS)				\
-	-Wno-missing-field-initializers
+	$(KOLAB_INCLUDE)			\
+	$(CAMEL_CFLAGS)				\
+	$(GLIB_CFLAGS)				\
+	$(EDS_CFLAGS)				\
+	$(NSS_CFLAGS)
 
-libcamelkolab_la_LDFLAGS =			\
-	-module					\
-	-avoid-version
+libcamelkolab_la_LDFLAGS = -module -avoid-version
 
 libcamelkolab_la_LIBADD =			\
 	$(SQLITE_LIBS)				\
@@ -40,37 +52,6 @@ libcamelkolab_la_LIBADD =			\
 	$(KOLAB_LIB_CAMEL_IMAPX)		\
 	$(KOLAB_LIB_EKOLABUTIL)
 
-EXTRA_DIST =					\
-	$(camel_provider_DATA)
-
-AM_CPPFLAGS =					\
-	$(CAMEL_CFLAGS)				\
-	$(GLIB_CFLAGS)				\
-	$(EDS_CFLAGS)				\
-	$(NSS_CFLAGS)
-
-SUBDIRS =					\
-	providers				\
-	tests
-
-AM_CFLAGS =					\
-	$(CFLAGS)				\
-	$(ADD_CFLAGS)				\
-	$(KOLAB_INCLUDE)
-
-noinst_HEADERS =				\
-	camel-kolab-imapx-conn-manager.h	\
-	camel-kolab-imapx-folder.h		\
-	camel-kolab-imapx-metadata-db.h		\
-	camel-kolab-imapx-metadata.h		\
-	camel-kolab-imapx-provider.h		\
-	camel-kolab-imapx-server.h		\
-	camel-kolab-imapx-settings.h		\
-	camel-kolab-imapx-store.h		\
-	camel-kolab-session.h			\
-	camel-kolab-stream.h
-
-noinstdir = \
-	$(pkgincludedir)
+EXTRA_DIST = $(camel_provider_DATA)
 
-## File created by the gnome-build tools
+-include $(top_srcdir)/git.mk
diff --git a/src/camel/camel-kolab-session.c b/src/camel/camel-kolab-session.c
index d2f8c33..51c445e 100644
--- a/src/camel/camel-kolab-session.c
+++ b/src/camel/camel-kolab-session.c
@@ -38,8 +38,8 @@
 #include <config.h>
 #endif
 
-#include <nss/pk11func.h>
-#include <nspr/prtypes.h>
+#include <pk11func.h>
+#include <prtypes.h>
 
 #include <libedataserver/e-account.h>
 #include <libedataserverui/e-passwords.h>
diff --git a/src/camel/providers/Makefile.am b/src/camel/providers/Makefile.am
index ffbcdc2..bc8ad18 100644
--- a/src/camel/providers/Makefile.am
+++ b/src/camel/providers/Makefile.am
@@ -1,16 +1,14 @@
+## Process this file with automake to produce Makefile.in
 
-SUBDIRS = \
-	imapx
+SUBDIRS = imapx
 
-other_files_DATA = \
-	README    \
+other_files_DATA =	\
+	README		\
 	VERSIONS
 
-other_filesdir = \
+other_filesdir =	\
 	$(pkgdatadir)
 
-EXTRA_DIST = \
-	$(other_files_DATA)
-
-## File created by the gnome-build tools
+EXTRA_DIST = $(other_files_DATA)
 
+-include $(top_srcdir)/git.mk
diff --git a/src/eplugin/Makefile.am b/src/eplugin/Makefile.am
index 3b300e1..850b509 100644
--- a/src/eplugin/Makefile.am
+++ b/src/eplugin/Makefile.am
@@ -1,67 +1,36 @@
-# included eplugin-rule.mk directly,
-# otherwise 'make distcheck' fails
-%.eplug: %.eplug.in
-	sed -e 's|\ PLUGINDIR\@|$(plugindir)|'		\
-	-e 's|\ SOEXT\@|$(SOEXT)|'			\
-	-e 's|\ GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|'	\
-	-e 's|\ LOCALEDIR\@|$(localedir)|' $< > $@
-
-%.eplug.in: %.eplug.xml
-	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
-
-%.error: %.error.xml
-	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
-
-plugin_DATA = \
-	org-gnome-kolab.eplug
-
-plugin_LTLIBRARIES = \
-	liborg-gnome-kolab.la
-
-liborg_gnome_kolab_la_SOURCES = \
-	kolab-account-setup.c  
-
-liborg_gnome_kolab_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE) \
-	$(EVOLUTION_CFLAGS)
-
-liborg_gnome_kolab_la_CFLAGS = \
-	$(CFLAGS) \
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS =			\
+	$(KOLAB_INCLUDE)	\
+	$(EVOLUTION_CFLAGS)	\
+	$(EDS_CFLAGS)		\
+	$(GLIB_CFLAGS)		\
+	$(GTK_CFLAGS)		\
+	$(CFLAGS)		\
 	$(ADD_CFLAGS)
 
-liborg_gnome_kolab_la_LDFLAGS = \
-	-module \
-	-avoid-version
+noinst_HEADERS = \
+	kolab-account-setup.h
 
-liborg_gnome_kolab_la_LIBADD =             \
-	$(EDS_LIBS)             \
-	$(GLIB_LIBS)             \
-	$(GTK_LIBS)             \
-	$(EVOLUTION_LIBS) \
-	$(KOLAB_LIB_EKOLABBACKEND)
+ EVO_PLUGIN_RULE@
 
-AM_CPPFLAGS = \
-	$(EDS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
+plugin_DATA = org-gnome-kolab.eplug
 
-SUBDIRS = \
-	tests
+plugin_LTLIBRARIES = liborg-gnome-kolab.la
 
-AM_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS) \
-	$(KOLAB_INCLUDE)
+liborg_gnome_kolab_la_SOURCES = kolab-account-setup.c
 
-noinst_HEADERS = \
-	kolab-account-setup.h
+liborg_gnome_kolab_la_LDFLAGS = -module -avoid-version
 
-noinstdir = \
-	$(pkgincludedir)
+liborg_gnome_kolab_la_LIBADD =		\
+	$(EDS_LIBS)			\
+	$(GLIB_LIBS)			\
+	$(GTK_LIBS)			\
+	$(EVOLUTION_LIBS)		\
+	$(KOLAB_LIB_EKOLABBACKEND)
 
-EXTRA_DIST = \
-	org-gnome-kolab.eplug.xml \
+EXTRA_DIST =				\
+	org-gnome-kolab.eplug.xml	\
 	$(noinst_HEADERS)
 
 BUILT_SOURCES = org-gnome-kolab.eplug	
@@ -69,5 +38,3 @@ BUILT_SOURCES = org-gnome-kolab.eplug
 CLEANFILES = $(BUILT_SOURCES)
 
 -include $(top_srcdir)/git.mk
-
-## File created by the gnome-build tools
diff --git a/src/libekolab/Makefile.am b/src/libekolab/Makefile.am
index 4656007..4e30905 100644
--- a/src/libekolab/Makefile.am
+++ b/src/libekolab/Makefile.am
@@ -1,122 +1,98 @@
-SUBDIRS = \
-	tests
+## Process this file with automake to produce Makefile.in
 
-lib_LTLIBRARIES = \
-	libekolab.la \
+lib_LTLIBRARIES =		\
+	libekolab.la		\
 	libekolabbackend.la
 
+AM_CPPFLAGS =			\
+	$(GLIB_CFLAGS)		\
+	$(CAMEL_CFLAGS)		\
+	$(SOUP_CFLAGS)		\
+	$(EDS_CFLAGS)		\
+	$(CURL_CFLAGS)		\
+	$(SQLITE_CFLAGS)	\
+	$(ICAL_CFLAGS)		\
+	$(CFLAGS)		\
+	$(ADD_CFLAGS)		\
+	$(KOLAB_INCLUDE)	\
+	$(EVOLUTION_CFLAGS)
+
 ## --- libekolab ---------------------------------------------------------------
 
 libekolab_la_SOURCES = \
 	kolab-settings-handler.c
 
-noinst_HEADERS = \
-	kolab-types.h \
-	kolab-settings-handler.h \
-	kolab-mail-access.h \
-	kolab-mail-side-cache.h \
-	kolab-mail-synchronizer.h \
-	kolab-mail-handle.h \
-	kolab-mail-handle-friend.h \
-	kolab-mail-info-db.h \
-	kolab-mail-mime-builder.h \
-	kolab-mail-summary.h \
-	kolab-mail-imap-client.h \
-	kolab-backend-types.h \
-	kolab-folder-summary.h \
-	kolab-util-backend.h \
+noinst_HEADERS =			\
+	kolab-types.h			\
+	kolab-settings-handler.h	\
+	kolab-mail-access.h		\
+	kolab-mail-side-cache.h		\
+	kolab-mail-synchronizer.h	\
+	kolab-mail-handle.h		\
+	kolab-mail-handle-friend.h	\
+	kolab-mail-info-db.h		\
+	kolab-mail-mime-builder.h	\
+	kolab-mail-summary.h		\
+	kolab-mail-imap-client.h	\
+	kolab-backend-types.h		\
+	kolab-folder-summary.h		\
+	kolab-util-backend.h		\
 	kolab-mail-info-db-record.h
 	
-noinstdir = \
-	$(pkgincludedir)
-
-libekolab_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE) \
-	-DG_LOG_DOMAIN=\"kolab-libekolab\" \
-	$(EVOLUTION_CFLAGS)
-
-libekolab_la_LIBADD =   \
-	$(GLIB_LIBS)   \
-	$(CAMEL_LIBS)   \
-	$(KOLAB_LIB_CAMEL)   \
-	$(SOUP_LIBS)   \
-	$(EDS_LIBS)   \
-	$(CURL_LIBS)   \
+libekolab_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)			\
+	-DG_LOG_DOMAIN=\"kolab-libekolab\"
+
+libekolab_la_LIBADD =			\
+	$(GLIB_LIBS)			\
+	$(CAMEL_LIBS)			\
+	$(KOLAB_LIB_CAMEL)		\
+	$(SOUP_LIBS)			\
+	$(EDS_LIBS)			\
+	$(CURL_LIBS)			\
 	$(EVOLUTION_LIBS)
 
-libekolab_la_LDFLAGS = \
-	-module \
-	-avoid-version
-
-libekolab_la_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS)
+libekolab_la_LDFLAGS = -module -avoid-version
 
 ## --- libekolabbackend --------------------------------------------------------
 
-libekolabbackend_la_SOURCES = \
-	kolab-mail-access.c \
-	kolab-mail-side-cache.c \
-	kolab-mail-synchronizer.c \
-	kolab-mail-handle.c \
-	kolab-mail-info-db.c \
-	kolab-mail-mime-builder.c \
-	kolab-mail-summary.c \
-	kolab-mail-imap-client.c \
-	kolab-folder-summary.c \
-	kolab-util-backend.c \
-	kolab-mail-info-db-record.c 
-
-libekolabbackend_la_LDFLAGS = \
-	-module \
-	-avoid-version
-
-libekolabbackend_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(SQLITE_CFLAGS) \
-	$(KOLAB_INCLUDE) \
+libekolabbackend_la_SOURCES =		\
+	kolab-mail-access.c		\
+	kolab-mail-side-cache.c		\
+	kolab-mail-synchronizer.c	\
+	kolab-mail-handle.c		\
+	kolab-mail-info-db.c		\
+	kolab-mail-mime-builder.c	\
+	kolab-mail-summary.c		\
+	kolab-mail-imap-client.c	\
+	kolab-folder-summary.c		\
+	kolab-util-backend.c		\
+	kolab-mail-info-db-record.c
+
+libekolabbackend_la_LDFLAGS = -module -avoid-version
+
+libekolabbackend_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)			\
 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
-	-DG_LOG_DOMAIN=\"kolab-libekolabbackend\" \
-	$(ICAL_CFLAGS)
-
-libekolabbackend_la_CFLAGS = \
-	$(CFLAGS) \
-	$(SQLITE_CFLAGS) \
-	$(ADD_CFLAGS)
-
-libekolabbackend_la_LIBADD = \
-	$(CAMEL_LIBS) \
-	$(SQLITE_LIBS) \
-	$(EDS_LIBS) \
-	$(GLIB_LIBS) \
-	$(ICAL_LIBS) \
-	$(KOLAB_LIB_CAMEL) \
-	$(KOLAB_LIB_EKOLAB) \
-	$(KOLAB_LIB_EKOLABUTIL) \
-	$(KOLAB_LIB_EKOLABCONVEVOLUTION) \
-	$(KOLAB_LIB_EKOLABCONVKOLAB) \
-	$(KOLAB_LIB_EKOLABCONVSTRUCTS) \
+	-DG_LOG_DOMAIN=\"kolab-libekolabbackend\"
+
+libekolabbackend_la_LIBADD =			\
+	$(CAMEL_LIBS)				\
+	$(SQLITE_LIBS)				\
+	$(EDS_LIBS)				\
+	$(GLIB_LIBS)				\
+	$(ICAL_LIBS)				\
+	$(KOLAB_LIB_CAMEL)			\
+	$(KOLAB_LIB_EKOLAB)			\
+	$(KOLAB_LIB_EKOLABUTIL)			\
+	$(KOLAB_LIB_EKOLABCONVEVOLUTION)	\
+	$(KOLAB_LIB_EKOLABCONVKOLAB)		\
+	$(KOLAB_LIB_EKOLABCONVSTRUCTS)		\
 	$(KOLAB_LIB_EKOLABCONV)
 
 ## --- module ------------------------------------------------------------------
 
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(CAMEL_CFLAGS) \
-	$(SOUP_CFLAGS) \
-	$(EDS_CFLAGS) \
-	$(CURL_CFLAGS)
-
-AM_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS) \
-	$(KOLAB_INCLUDE)
-
-EXTRA_DIST = \
-	$(noinst_util_HEADERS) \
-	$(noinst_HEADERS) \
-	$(noinst_backend_HEADERS)
 
-## File created by the gnome-build tools
+EXTRA_DIST = $(noinst_HEADERS)
 
+-include $(top_srcdir)/git.mk
diff --git a/src/libekolabconv/Makefile.am b/src/libekolabconv/Makefile.am
index dda0dcf..2de4832 100644
--- a/src/libekolabconv/Makefile.am
+++ b/src/libekolabconv/Makefile.am
@@ -1,6 +1,5 @@
-
+## Process this file with automake to produce Makefile.in
 
 SUBDIRS = main test
 
-## File created by the gnome-build tools
-
+-include $(top_srcdir)/git.mk
diff --git a/src/libekolabconv/main/Makefile.am b/src/libekolabconv/main/Makefile.am
index 02962da..0540e6c 100644
--- a/src/libekolabconv/main/Makefile.am
+++ b/src/libekolabconv/main/Makefile.am
@@ -1,2 +1,5 @@
-SUBDIRS = \
-	src
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = src
+
+-include $(top_srcdir)/git.mk
diff --git a/src/libekolabconv/main/src/Makefile.am b/src/libekolabconv/main/src/Makefile.am
index 2bfad81..8146b7f 100644
--- a/src/libekolabconv/main/src/Makefile.am
+++ b/src/libekolabconv/main/src/Makefile.am
@@ -1,45 +1,38 @@
-SUBDIRS = \
-	evolution\
-	kolab \
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS =		\
+	evolution	\
+	kolab		\
 	structs
 
-lib_LTLIBRARIES = \
-	libekolabconv.la
+lib_LTLIBRARIES = libekolabconv.la
+
+AM_CPPFLAGS =				\
+	$(EDS_CFLAGS)			\
+	$(CAMEL_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
+	$(CFLAGS)			\
+	$(ADD_CFLAGS)			\
+	-DG_LOG_DOMAIN=\"libekolabconv\"
 
-libekolabconv_la_SOURCES = \
-	kolab-conv.c  \
-	logging.c  \
+libekolabconv_la_SOURCES =		\
+	kolab-conv.c			\
+	logging.c			\
 	util.c
 	
-libekolabconv_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)
-
-libekolabconv_la_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS)
-
-libekolabconv_la_LIBADD = \
-	$(EDS_LIBS) \
-	$(CAMEL_LIBS) \
-	$(GLIB_LIBS) \
+noinst_HEADERS =			\
+	kolab-conv.h			\
+	logging.h			\
+	util.h
+
+libekolabconv_la_LIBADD =		\
+	$(EDS_LIBS)			\
+	$(CAMEL_LIBS)			\
+	$(GLIB_LIBS)			\
 	$(KOLAB_LIB_EKOLABCONVEVOLUTION) \
-	$(KOLAB_LIB_EKOLABCONVKOLAB) \
+	$(KOLAB_LIB_EKOLABCONVKOLAB)	\
 	$(KOLAB_LIB_EKOLABCONVSTRUCTS)
 
-AM_CPPFLAGS = \
-	$(EDS_CFLAGS) $(CAMEL_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\"libekolabconv\"
-
-noinst_HEADERS = \
-	kolab-conv.h \
-	logging.h  \
-	util.h  
-
-noinstdir = \
-	$(pkgincludedir)
-
-EXTRA_DIST = \
-	$(noinst_HEADERS)
+EXTRA_DIST = $(noinst_HEADERS)
 
-## File created by the gnome-build tools
+-include $(top_srcdir)/git.mk
diff --git a/src/libekolabconv/main/src/evolution/Makefile.am b/src/libekolabconv/main/src/evolution/Makefile.am
index 2b4b562..8eac594 100644
--- a/src/libekolabconv/main/src/evolution/Makefile.am
+++ b/src/libekolabconv/main/src/evolution/Makefile.am
@@ -1,6 +1,15 @@
+## Process this file with automake to produce Makefile.in
+
 noinst_LTLIBRARIES =			\
 	libekolabconvevolution.la
 
+AM_CPPFLAGS =				\
+	$(CAMEL_CFLAGS)			\
+	$(EDS_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
+	$(CFLAGS)			\
+	$(ADD_CFLAGS)
+
 libekolabconvevolution_la_SOURCES =	\
 	contact-e-to-i.c		\
 	contact-i-to-e.c		\
@@ -17,37 +26,18 @@ libekolabconvevolution_la_SOURCES =	\
 	task-e-to-i.c			\
 	task-i-to-e.c
 
-libekolabconvevolution_la_CPPFLAGS =	\
-	$(AM_CPPFLAGS)
-
-libekolabconvevolution_la_CFLAGS =	\
-	$(CFLAGS)			\
-	$(ADD_CFLAGS)
-
-libekolabconvevolution_la_LIBADD =	\
-	$(CAMEL_LIBS)			\
-	$(EDS_LIBS)			\
-	$(GLIB_LIBS)
-
-libekolabconvevolution_la_LDFLAGS =	\
-	-avoid-version			\
-	-static				\
-	$(NO_UNDEFINED)
-
 noinst_HEADERS =			\
 	evolution.h			\
 	evolution-util.h		\
 	priv-evolution.h
 
-noinstdir =				\
-	$(pkgincludedir)
+libekolabconvevolution_la_LDFLAGS = -avoid-version -static $(NO_UNDEFINED)
 
-EXTRA_DIST =				\
-	$(noinst_HEADERS)
+libekolabconvevolution_la_LIBADD =	\
+	$(CAMEL_LIBS)			\
+	$(EDS_LIBS)			\
+	$(GLIB_LIBS)
 
-AM_CPPFLAGS =				\
-	$(CAMEL_CFLAGS)			\
-	$(EDS_CFLAGS)			\
-	$(GLIB_CFLAGS)
+EXTRA_DIST = $(noinst_HEADERS)
 
-## File created by the gnome-build tools
+-include $(top_srcdir)/git.mk
diff --git a/src/libekolabconv/main/src/kolab/Makefile.am b/src/libekolabconv/main/src/kolab/Makefile.am
index 31768f2..3e5c14c 100644
--- a/src/libekolabconv/main/src/kolab/Makefile.am
+++ b/src/libekolabconv/main/src/kolab/Makefile.am
@@ -1,5 +1,13 @@
-noinst_LTLIBRARIES =			\
-	libekolabconvkolab.la
+## Process this file with automake to produce Makefile.in
+
+noinst_LTLIBRARIES = libekolabconvkolab.la
+
+AM_CPPFLAGS =				\
+	$(EDS_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
+	$(CAMEL_CFLAGS)			\
+	$(CFLAGS)			\
+	$(ADD_CFLAGS)
 
 libekolabconvkolab_la_SOURCES =		\
 	contact-i-to-k.c		\
@@ -17,38 +25,19 @@ libekolabconvkolab_la_SOURCES =		\
 	task-i-to-k.c			\
 	task-k-to-i.c
 
-libekolabconvkolab_la_CPPFLAGS =	\
-	$(AM_CPPFLAGS)
-
-libekolabconvkolab_la_CFLAGS =		\
-	$(CFLAGS)			\
-	$(ADD_CFLAGS)
-
-libekolabconvkolab_la_LIBADD =		\
-	$(EDS_LIBS)			\
-	$(GLIB_LIBS)			\
-	$(CAMEL_LIBS)
-
-libekolabconvkolab_la_LDFLAGS =		\
-	-avoid-version			\
-	-static				\
-	$(NO_UNDEFINED)
-
 noinst_HEADERS =			\
 	kolab.h				\
 	kolab-constants.h		\
 	kolab-util.h			\
 	priv-kolab.h
 
-noinstdir =				\
-	$(pkgincludedir)
+libekolabconvkolab_la_LDFLAGS = -avoid-version -static $(NO_UNDEFINED)
 
-EXTRA_DIST =				\
-	$(noinst_HEADERS)
+libekolabconvkolab_la_LIBADD =		\
+	$(EDS_LIBS)			\
+	$(GLIB_LIBS)			\
+	$(CAMEL_LIBS)
 
-AM_CPPFLAGS =				\
-	$(EDS_CFLAGS)			\
-	$(GLIB_CFLAGS)			\
-	$(CAMEL_CFLAGS)
+EXTRA_DIST = $(noinst_HEADERS)
 
-## File created by the gnome-build tools
+-include $(top_srcdir)/git.mk
diff --git a/src/libekolabconv/main/src/structs/Makefile.am b/src/libekolabconv/main/src/structs/Makefile.am
index e909732..9bb2823 100644
--- a/src/libekolabconv/main/src/structs/Makefile.am
+++ b/src/libekolabconv/main/src/structs/Makefile.am
@@ -1,5 +1,13 @@
-noinst_LTLIBRARIES =			\
-	libekolabconvstructs.la
+## Process this file with automake to produce Makefile.in
+
+noinst_LTLIBRARIES = libekolabconvstructs.la
+
+AM_CPPFLAGS =				\
+	$(CAMEL_CFLAGS)			\
+	$(EDS_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
+	$(CFLAGS)			\
+	$(ADD_CFLAGS)
 
 libekolabconvstructs_la_SOURCES =	\
 	common.c			\
@@ -9,23 +17,6 @@ libekolabconvstructs_la_SOURCES =	\
 	note.c				\
 	task.c
 
-libekolabconvstructs_la_CPPFLAGS =	\
-	$(AM_CPPFLAGS)
-
-libekolabconvstructs_la_CFLAGS =	\
-	$(CFLAGS)			\
-	$(ADD_CFLAGS)
-
-libekolabconvstructs_la_LIBADD =	\
-	$(CAMEL_LIBS)			\
-	$(EDS_LIBS)			\
-	$(GLIB_LIBS)
-
-libekolabconvstructs_la_LDFLAGS =	\
-	-avoid-version			\
-	-static				\
-	$(NO_UNDEFINED)
-
 noinst_HEADERS =			\
 	common.h			\
 	contact.h			\
@@ -34,15 +25,13 @@ noinst_HEADERS =			\
 	note.h				\
 	task.h
 
-noinstdir =				\
-	$(pkgincludedir)
+libekolabconvstructs_la_LDFLAGS = -avoid-version -static $(NO_UNDEFINED)
 
-EXTRA_DIST =				\
-	$(noinst_HEADERS)
+libekolabconvstructs_la_LIBADD =	\
+	$(CAMEL_LIBS)			\
+	$(EDS_LIBS)			\
+	$(GLIB_LIBS)
 
-AM_CPPFLAGS =				\
-	$(CAMEL_CFLAGS)			\
-	$(EDS_CFLAGS)			\
-	$(GLIB_CFLAGS)
+EXTRA_DIST = $(noinst_HEADERS)
 
-## File created by the gnome-build tools
+-include $(top_srcdir)/git.mk
diff --git a/src/libekolabutil/Makefile.am b/src/libekolabutil/Makefile.am
index e76d6cf..d05fb4c 100644
--- a/src/libekolabutil/Makefile.am
+++ b/src/libekolabutil/Makefile.am
@@ -1,53 +1,34 @@
+## Process this file with automake to produce Makefile.in
 
-lib_LTLIBRARIES = \
-	libekolabutil.la
+lib_LTLIBRARIES = libekolabutil.la
 
-libekolabutil_la_SOURCES = \
-	kolab-util-cal-freebusy.c\
-	kolab-util-camel.c \
-	kolab-util-glib.c \
-	kolab-util-http.c \
-	kolab-util-ldap.c \
-	kolab-util-error.c \
-	kolab-util-folder.c \
-	kolab-http-job.c \
-	kolab-util-kconv.c \
-	kolab-util-sqlite.c 
-
-libekolabutil_la_LDFLAGS = \
-	-module \
-	-avoid-version
-
-libekolabutil_la_LIBADD = \
-	$(CAMEL_LIBS) \
-	$(EDS_LIBS) \
-	$(EVOLUTION_LIBS) \
-	$(GLIB_LIBS) \
-	$(CURL_LIBS) \
-	$(SOUP_LIBS) \
-	$(KOLAB_LIB_EKOLABCONV) \
-	$(ICAL_LIBS) \
-	$(SQLITE_LIBS) \
-	$(NSS_LIBS)
-
-libekolabutil_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE) \
-	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+AM_CPPFLAGS =				\
+	-DCAMEL_PROVIDERDIR=\"$(camel_providerdir)\" \
 	-DG_LOG_DOMAIN=\"kolab-libekolabutil\" \
-	$(ICAL_CFLAGS) \
-	$(CAMEL_CFLAGS) \
-	$(EDS_CFLAGS) \
-	$(EVOLUTION_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(CURL_CFLAGS) \
-	$(SOUP_CFLAGS) \
-	$(SQLITE_CFLAGS) \
-	$(NSS_CFLAGS)
+	$(SQLITE_CFLAGS)		\
+	$(NSS_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
+	$(CAMEL_CFLAGS)			\
+	$(SOUP_CFLAGS)			\
+	$(EDS_CFLAGS)			\
+	$(EVOLUTION_CFLAGS)		\
+	$(CURL_CFLAGS)			\
+	$(ICAL_CFLAGS)			\
+	$(CFLAGS)			\
+	$(ADD_CFLAGS)			\
+	$(KOLAB_INCLUDE)
 
-libekolabutil_la_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS)
+libekolabutil_la_SOURCES =		\
+	kolab-util-cal-freebusy.c	\
+	kolab-util-camel.c		\
+	kolab-util-glib.c		\
+	kolab-util-http.c		\
+	kolab-util-ldap.c		\
+	kolab-util-error.c		\
+	kolab-util-folder.c		\
+	kolab-http-job.c		\
+	kolab-util-kconv.c		\
+	kolab-util-sqlite.c
 
 noinst_HEADERS = \
 	kolab-util-cal-freebusy.h \
@@ -63,25 +44,20 @@ noinst_HEADERS = \
 	kolab-util-sqlite.h \
 	camel-system-headers.h
 
-noinstdir = \
-	$(pkgincludedir)
-
-EXTRA_DIST = \
-	$(noinst_HEADERS)
-
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS)\
-	$(CAMEL_CFLAGS)\
-	$(SOUP_CFLAGS)\
-	$(EDS_CFLAGS)\
-	$(EVOLUTION_CFLAGS)\
-	$(CURL_CFLAGS)\
-	$(ICAL_CFLAGS)
-
-AM_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS) \
-	$(KOLAB_INCLUDE)
+libekolabutil_la_LDFLAGS = -module -avoid-version
+
+libekolabutil_la_LIBADD =		\
+	$(CAMEL_LIBS)			\
+	$(EDS_LIBS)			\
+	$(EVOLUTION_LIBS)		\
+	$(GLIB_LIBS)			\
+	$(CURL_LIBS)			\
+	$(SOUP_LIBS)			\
+	$(KOLAB_LIB_EKOLABCONV)		\
+	$(ICAL_LIBS)			\
+	$(SQLITE_LIBS)			\
+	$(NSS_LIBS)
 
-## File created by the gnome-build tools
+EXTRA_DIST = $(noinst_HEADERS)
 
+-include $(top_srcdir)/git.mk
diff --git a/src/libekolabutil/kolab-util-ldap.c b/src/libekolabutil/kolab-util-ldap.c
index 81afc6a..3e0186c 100644
--- a/src/libekolabutil/kolab-util-ldap.c
+++ b/src/libekolabutil/kolab-util-ldap.c
@@ -23,7 +23,6 @@
 #include <camel/camel-kolab-session.h>
 
 #include <curl/curl.h>
-#include <curl/types.h>
 
 #include <string.h>
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 0d82305..e5c23ee 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,41 +1,29 @@
+## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = \
-	tdriver
+SUBDIRS = integration
 
-tdriver_SOURCES = \
-	tdriver.c\
-	tdriver.h 
+bin_PROGRAMS = tdriver
 
-tdriver_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE)
-
-tdriver_CFLAGS = \
-	$(CFLAGS) \
+AM_CPPFLAGS =			\
+	$(GLIB_CFLAGS)		\
+	$(CAMEL_CFLAGS)		\
+	$(EDS_CFLAGS)		\
+	$(GTK_CFLAGS)		\
+	$(KOLAB_INCLUDE)	\
+	$(CFLAGS)		\
 	$(ADD_CFLAGS)
 
-tdriver_LDADD = \
-	$(KOLAB_LIB_BOOK) \
-	$(KOLAB_LIB_CAL) \
-	$(KOLAB_LIB_CAMEL) \
-	$(GLIB_LIBS) \
-	$(CAMEL_LIBS) \
-	$(EDS_LIBS) \
+tdriver_SOURCES =		\
+	tdriver.c		\
+	tdriver.h
+
+tdriver_LDADD =			\
+	$(KOLAB_LIB_BOOK)	\
+	$(KOLAB_LIB_CAL)	\
+	$(KOLAB_LIB_CAMEL)	\
+	$(GLIB_LIBS)		\
+	$(CAMEL_LIBS)		\
+	$(EDS_LIBS)		\
 	$(GTK_LIBS)
 
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(CAMEL_CFLAGS) \
-	$(EDS_CFLAGS) \
-	$(GTK_CFLAGS)
-
-AM_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS) \
-	$(KOLAB_INCLUDE)
-
-SUBDIRS = \
-	integration
-
-## File created by the gnome-build tools
-
+-include $(top_srcdir)/git.mk
diff --git a/src/tests/integration/Makefile.am b/src/tests/integration/Makefile.am
index 4aa1998..153b46d 100644
--- a/src/tests/integration/Makefile.am
+++ b/src/tests/integration/Makefile.am
@@ -1,12 +1,7 @@
+## Process this file with automake to produce Makefile.in
 
-SUBDIRS = \
-	libekolab\
+SUBDIRS =		\
+	libekolab	\
 	libcamelkolab
 
-AM_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS) \
-	$(KOLAB_INCLUDE)
-
-## File created by the gnome-build tools
-
+-include $(top_srcdir)/git.mk
diff --git a/src/tests/integration/libcamelkolab/Makefile.am b/src/tests/integration/libcamelkolab/Makefile.am
index fc6bfba..6bd98f1 100644
--- a/src/tests/integration/libcamelkolab/Makefile.am
+++ b/src/tests/integration/libcamelkolab/Makefile.am
@@ -1,30 +1,20 @@
+## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = \
-	camel-kolab-imapx-provider
+bin_PROGRAMS = camel-kolab-imapx-provider
 
-camel_kolab_imapx_provider_SOURCES = \
-	test-camel-kolab-imapx-provider.c
-
-camel_kolab_imapx_provider_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+AM_CPPFLAGS =					\
+	$(CAMEL_CFLAGS)				\
+	$(GLIB_CFLAGS)				\
+	$(CFLAGS)				\
+	$(ADD_CFLAGS)				\
 	$(KOLAB_INCLUDE)
 
-camel_kolab_imapx_provider_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS)
+camel_kolab_imapx_provider_SOURCES =		\
+	test-camel-kolab-imapx-provider.c
 
-camel_kolab_imapx_provider_LDADD = \
-	$(CAMEL_LIBS) \
-	$(GLIB_LIBS) \
+camel_kolab_imapx_provider_LDADD =		\
+	$(CAMEL_LIBS)				\
+	$(GLIB_LIBS)				\
 	$(KOLAB_LIB_CAMEL)
 
-AM_CPPFLAGS = \
-	$(CAMEL_CFLAGS) \
-	$(GLIB_CFLAGS)
-
-AM_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS) \
-	$(KOLAB_INCLUDE)
-
-## File created by the gnome-build tools
+-include $(top_srcdir)/git.mk
diff --git a/src/tests/integration/libekolab/Makefile.am b/src/tests/integration/libekolab/Makefile.am
index b934dd5..16c6f0b 100644
--- a/src/tests/integration/libekolab/Makefile.am
+++ b/src/tests/integration/libekolab/Makefile.am
@@ -1,100 +1,70 @@
+## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = \
-	test-kolab-util-http \
-	test-kolab-util-cal-freebusy \
-	test-kolab-util-ldap \
+bin_PROGRAMS =					\
+	test-kolab-util-http			\
+	test-kolab-util-cal-freebusy		\
+	test-kolab-util-ldap			\
 	test-kolab-mail-access
 
-test_kolab_mail_access_SOURCES = \
-	test-kolab-mail-access.c
-
-test_kolab_mail_access_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+AM_CPPFLAGS =					\
+	$(GLIB_CFLAGS)				\
+	$(CAMEL_CFLAGS)				\
+	$(SQLITE_CFLAGS)			\
+	$(EDS_CFLAGS)				\
+	$(ICAL_CFLAGS)				\
+	$(CFLAGS)				\
+	$(ADD_CFLAGS)				\
 	$(KOLAB_INCLUDE)
 
-test_kolab_mail_access_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS)
+test_kolab_mail_access_SOURCES =		\
+	test-kolab-mail-access.c
 
-test_kolab_mail_access_LDADD =            \
-	$(CAMEL_LIBS) \
-	$(SQLITE_LIBS) \
-	$(EDS_LIBS) \
-	$(GLIB_LIBS) \
-	$(ICAL_LIBS) \
-	$(KOLAB_LIB_CAMEL) \
-	$(KOLAB_LIB_EKOLAB) \
-	$(KOLAB_LIB_EKOLABBACKEND) \
-	$(KOLAB_LIB_EKOLABUTIL) \
-	$(KOLAB_LIB_EKOLABCONVEVOLUTION) \
-	$(KOLAB_LIB_EKOLABCONVKOLAB) \
-	$(KOLAB_LIB_EKOLABCONVSTRUCTS) \
+test_kolab_mail_access_LDADD =			\
+	$(CAMEL_LIBS)				\
+	$(SQLITE_LIBS)				\
+	$(EDS_LIBS)				\
+	$(GLIB_LIBS)				\
+	$(ICAL_LIBS)				\
+	$(KOLAB_LIB_CAMEL)			\
+	$(KOLAB_LIB_EKOLAB)			\
+	$(KOLAB_LIB_EKOLABBACKEND)		\
+	$(KOLAB_LIB_EKOLABUTIL)			\
+	$(KOLAB_LIB_EKOLABCONVEVOLUTION)	\
+	$(KOLAB_LIB_EKOLABCONVKOLAB)		\
+	$(KOLAB_LIB_EKOLABCONVSTRUCTS)		\
 	$(KOLAB_LIB_EKOLABCONV)
 
-test_kolab_util_ldap_SOURCES = \
+test_kolab_util_ldap_SOURCES =			\
 	test-kolab-util-ldap.c
 
-test_kolab_util_ldap_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE)
-
-test_kolab_util_ldap_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS)
-
-test_kolab_util_ldap_LDADD = \
-	$(CAMEL_LIBS) \
-	$(GLIB_LIBS) \
-	$(KOLAB_LIB_CAMEL) \
+test_kolab_util_ldap_LDADD =			\
+	$(CAMEL_LIBS)				\
+	$(GLIB_LIBS)				\
+	$(KOLAB_LIB_CAMEL)			\
 	$(KOLAB_LIB_EKOLABUTIL)
 
-test_kolab_util_cal_freebusy_SOURCES = \
+test_kolab_util_cal_freebusy_SOURCES =		\
 	test-kolab-util-cal-freebusy.c
 
-test_kolab_util_cal_freebusy_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE)
-
-test_kolab_util_cal_freebusy_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS)
-
-test_kolab_util_cal_freebusy_LDADD = \
-	$(CAMEL_LIBS) \
-	$(GLIB_LIBS) \
-	$(KOLAB_LIB_CAMEL) \
+test_kolab_util_cal_freebusy_LDADD =		\
+	$(CAMEL_LIBS)				\
+	$(GLIB_LIBS)				\
+	$(KOLAB_LIB_CAMEL)			\
 	$(KOLAB_LIB_EKOLABUTIL)
 
-test_kolab_util_http_SOURCES = \
+test_kolab_util_http_SOURCES =			\
 	test-kolab-util-http.c
 
-test_kolab_util_http_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(KOLAB_INCLUDE)
-
-test_kolab_util_http_LDADD = \
-	$(GLIB_LIBS) \
-	$(CAMEL_LIBS) \
-	$(KOLAB_LIB_CAMEL) \
+test_kolab_util_http_LDADD =			\
+	$(GLIB_LIBS)				\
+	$(CAMEL_LIBS)				\
+	$(KOLAB_LIB_CAMEL)			\
 	$(KOLAB_LIB_EKOLABUTIL)
 
-test_kolab_util_http_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS)
-
-AM_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS) \
-	$(KOLAB_INCLUDE)
-
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(CAMEL_CFLAGS)
-
-EXTRA_DIST = \
-	test-kolab-util-http.conf \
-	test-kolab-util-cal-freebusy.conf \
-	test-kolab-util-ldap.conf \
+EXTRA_DIST =					\
+	test-kolab-util-http.conf		\
+	test-kolab-util-cal-freebusy.conf	\
+	test-kolab-util-ldap.conf		\
 	test-kolab-mail-access.conf
 
-## File created by the gnome-build tools
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]