[evolution-kolab/gnome-2-30] libekolabconv: more autotools infrastructure sanitization (unit tests)

[Christian Hilberg <chilberg src gnome org>]

commit 7f94b56af31d089b0a27cd2998bd0e616b148849
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Nov 10 18:03:43 2011 +0100

    libekolabconv: more autotools infrastructure sanitization (unit tests)
    
    * account for the fact that autotools work recursively
      (added proper targets)
    * apply compiler warning settings used in the rest of the
      project
    * commented out all in testbase-pre.c, since it
      - is no longer used
      - breaks build with new compiler warnings because
        of multiple definitions of functions

 configure.ac                              |    4 ++
 src/libekolabconv/test/Makefile.am        |   47 +--------------------
 src/libekolabconv/test/src/Makefile.am    |   63 +++++++++++++++++++++++++++++
 src/libekolabconv/test/src/testbase-pre.c |    4 ++
 4 files changed, 73 insertions(+), 45 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c73f647..b54f8c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,9 @@ 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)
 
@@ -206,6 +209,7 @@ src/libekolabconv/main/src/evolution/Makefile
 src/libekolabconv/main/src/kolab/Makefile
 src/libekolabconv/main/src/structs/Makefile
 src/libekolabconv/test/Makefile
+src/libekolabconv/test/src/Makefile
 src/libekolabutil/Makefile
 src/tests/Makefile
 src/tests/integration/Makefile
diff --git a/src/libekolabconv/test/Makefile.am b/src/libekolabconv/test/Makefile.am
index b3b11a3..5e02114 100644
--- a/src/libekolabconv/test/Makefile.am
+++ b/src/libekolabconv/test/Makefile.am
@@ -1,46 +1,3 @@
-
-bin_PROGRAMS = UnitTest
-
-UnitTest_SOURCES = \
-	src/main.c \
-	src/main.h \
-	src/email-parser.c \
-	src/email-parser.h \
-	src/test-convert-setup.h \
-	src/test-kolab-contact.c \
-	src/test-kolab-event.c \
-	src/test-kolab-note.c \
-	src/test-kolab-task.c \
-	src/test-evolution-contact.c \
-	src/test-evolution-event.c \
-	src/test-evolution-note.c \
-	src/test-evolution-task.c \
-	src/testbase.c \
-	src/testbase.h \
-	src/test-util.c \
-	src/test-util.h
-	
-
-UnitTest_CFLAGS = \
-	$(CFLAGS) \
-	$(KOLAB_INCLUDE)
-
-UnitTest_LDFLAGS = -all -static
-
-UnitTest_LDADD = \
-	../main/libekolabconv.la \
-	$(GLIB_LIBS) \
-	$(EDS_LIBS) \
-	$(GMIME_LIBS)
-
-AM_CPPFLAGS = \
-	-I$(srcdir)/../main/src/ \
-	$(GLIB_CFLAGS) \
-	$(CAMEL_CFLAGS) \
-	$(EDS_CFLAGS) \
-	$(GTK_CFLAGS) \
-	-g \
-	-DG_LOG_DOMAIN=\"libekolabconv\" \
-	$(GMIME_CFLAGS)
-	
+SUBDIRS = \
+	src
 
diff --git a/src/libekolabconv/test/src/Makefile.am b/src/libekolabconv/test/src/Makefile.am
new file mode 100644
index 0000000..d6ea1ef
--- /dev/null
+++ b/src/libekolabconv/test/src/Makefile.am
@@ -0,0 +1,63 @@
+bin_PROGRAMS = \
+	unittest-libekolabconv
+
+unittest_libekolabconv_SOURCES = \
+	email-parser.c\
+	main.c \
+	testbase.c \
+	testbase-pre.c \
+	test-evolution-contact.c \
+	test-evolution-event.c \
+	test-evolution-note.c \
+	test-evolution-task.c \
+	test-kolab-contact.c \
+	test-kolab-event.c \
+	test-kolab-note.c \
+	test-kolab-task.c \
+	test-util.c
+
+unittest_libekolabconv_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"kolab-libekolabconv\" \
+	$(GMIME_CFLAGS)
+
+unittest_libekolabconv_LDADD = \
+	$(KOLAB_LIB_EKOLABCONV) \
+	$(CAMEL_LIBS) \
+	$(GLIB_LIBS) \
+	$(GMIME_LIBS) \
+	$(EDS_LIBS)
+
+unittest_libekolabconv_CFLAGS = \
+	$(CFLAGS) \
+	$(ADD_CFLAGS) \
+	$(KOLAB_INCLUDE) \
+	$(KOLAB_INCLUDE_EKOLABCONV)
+
+AM_CPPFLAGS = \
+	$(CAMEL_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GMIME_CFLAGS) \
+	$(EDS_CFLAGS)
+
+AM_CFLAGS = \
+	$(CFLAGS) \
+	$(ADD_CFLAGS) \
+	$(KOLAB_INCLUDE) \
+	$(KOLAB_INCLUDE_EKOLABCONV)
+
+noinst_HEADERS = \
+	email-parser.h \
+	main.h \
+	testbase.h \
+	test-convert-setup.h \
+	test-util.h
+
+noinstdir = \
+	$(pkgincludedir)
+
+EXTRA_DIST = \
+	$(noinst_HEADERS)
+
+## File created by the gnome-build tools
+
diff --git a/src/libekolabconv/test/src/testbase-pre.c b/src/libekolabconv/test/src/testbase-pre.c
index 02605f8..a1a6a7c 100644
--- a/src/libekolabconv/test/src/testbase-pre.c
+++ b/src/libekolabconv/test/src/testbase-pre.c
@@ -1,3 +1,5 @@
+#if 0
+
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
@@ -1622,3 +1624,5 @@ add_all_tests_I_note ()
 	for (i = 0; i < length; i++)
 		add_tests_evolution_I_note (test_e_I_note[i].filename, test_e_I_note[i].validate_op);
 }
+
+#endif