[evolution-kolab/gnome-2-30] libekolabconv: finalized autotools infrastructure sanitization

[Christian Hilberg <chilberg src gnome org>]

commit e79ab5b6d7e6eba87b96995a3133fb9cd74705be
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Nov 17 13:05:20 2011 +0100

    libekolabconv: finalized autotools infrastructure sanitization
    
    * moved build stuff for libekolabconv.la from
      src/libekolabconv/main/Makefile.am to
      src/libekolabconv/main/src/Makefile.am
    * libekolabconv (and parts of it) can now be built
      separately more easily

 configure.ac                           |    2 +-
 src/libekolabconv/main/Makefile.am     |   41 -------------------------------
 src/libekolabconv/main/src/Makefile.am |   42 ++++++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 44 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d956893..b187f88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ 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/libekolabconv.la"
+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"
diff --git a/src/libekolabconv/main/Makefile.am b/src/libekolabconv/main/Makefile.am
index 61a16c8..02962da 100644
--- a/src/libekolabconv/main/Makefile.am
+++ b/src/libekolabconv/main/Makefile.am
@@ -1,43 +1,2 @@
-lib_LTLIBRARIES = \
-	libekolabconv.la
-
-libekolabconv_la_SOURCES = \
-	src/kolab-conv.c  \
-	src/logging.c  \
-	src/util.c
-	
-libekolabconv_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)
-
-libekolabconv_la_CFLAGS = \
-	$(CFLAGS) \
-	$(ADD_CFLAGS)
-
-libekolabconv_la_LIBADD = \
-	$(EDS_LIBS) \
-	$(CAMEL_LIBS) \
-	$(GLIB_LIBS) \
-	$(KOLAB_LIB_EKOLABCONVEVOLUTION) \
-	$(KOLAB_LIB_EKOLABCONVKOLAB) \
-	$(KOLAB_LIB_EKOLABCONVSTRUCTS)
-
-AM_CPPFLAGS = \
-	$(EDS_CFLAGS) $(CAMEL_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\"libekolabconv\"
-
-noinst_HEADERS = \
-	src/kolab-conv.h \
-	src/logging.h  \
-	src/logging-anon-variadic-macros.h \
-	src/util.h  
-
-noinstdir = \
-	$(pkgincludedir)
-
-EXTRA_DIST = \
-	$(noinst_HEADERS)
-
 SUBDIRS = \
 	src
-
diff --git a/src/libekolabconv/main/src/Makefile.am b/src/libekolabconv/main/src/Makefile.am
index db4506c..bc354f7 100644
--- a/src/libekolabconv/main/src/Makefile.am
+++ b/src/libekolabconv/main/src/Makefile.am
@@ -1,8 +1,46 @@
-
 SUBDIRS = \
 	evolution\
 	kolab \
 	structs
 
-## File created by the gnome-build tools
+lib_LTLIBRARIES = \
+	libekolabconv.la
+
+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) \
+	$(KOLAB_LIB_EKOLABCONVEVOLUTION) \
+	$(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  \
+	logging-anon-variadic-macros.h \
+	util.h  
+
+noinstdir = \
+	$(pkgincludedir)
+
+EXTRA_DIST = \
+	$(noinst_HEADERS)
+
+## File created by the gnome-build tools