[evolution-kolab/ek-wip-porting] libekolabconv: statically link-in sub-libs

[Christian Hilberg <chilberg src gnome org>]

commit 6eb7aa5146f217aba17f34ff18489f4b0baa0722
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jan 16 16:14:51 2012 +0100

    libekolabconv: statically link-in sub-libs
    
    * link the libekolabconv{evolution,kolab,structs}
      sub-libraries statically into libekolabconv
    * do not install sub-libs

 src/libekolabconv/main/src/evolution/Makefile.am |   65 +++++++++++----------
 src/libekolabconv/main/src/kolab/Makefile.am     |   67 +++++++++++----------
 src/libekolabconv/main/src/structs/Makefile.am   |   55 +++++++++--------
 3 files changed, 98 insertions(+), 89 deletions(-)
---
diff --git a/src/libekolabconv/main/src/evolution/Makefile.am b/src/libekolabconv/main/src/evolution/Makefile.am
index 4fb2fb0..2b4b562 100644
--- a/src/libekolabconv/main/src/evolution/Makefile.am
+++ b/src/libekolabconv/main/src/evolution/Makefile.am
@@ -1,50 +1,53 @@
-
-lib_LTLIBRARIES = \
+noinst_LTLIBRARIES =			\
 	libekolabconvevolution.la
 
-libekolabconvevolution_la_SOURCES = \
-	contact-e-to-i.c           \
-	contact-i-to-e.c           \
-	event-e-to-i.c           \
-	event-i-to-e.c           \
-	evolution-util.c           \
-	note-e-to-i.c           \
-	note-i-to-e.c           \
-	priv-common-e-to-i.c           \
-	priv-common-i-to-e.c           \
-	priv-evolution-preserve.c           \
-	priv-incidence-e-to-i.c           \
-	priv-incidence-i-to-e.c           \
-	task-e-to-i.c           \
+libekolabconvevolution_la_SOURCES =	\
+	contact-e-to-i.c		\
+	contact-i-to-e.c		\
+	event-e-to-i.c			\
+	event-i-to-e.c			\
+	evolution-util.c		\
+	note-e-to-i.c			\
+	note-i-to-e.c			\
+	priv-common-e-to-i.c		\
+	priv-common-i-to-e.c		\
+	priv-evolution-preserve.c	\
+	priv-incidence-e-to-i.c		\
+	priv-incidence-i-to-e.c		\
+	task-e-to-i.c			\
 	task-i-to-e.c
 
-libekolabconvevolution_la_CPPFLAGS = \
+libekolabconvevolution_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)
 
-libekolabconvevolution_la_CFLAGS = \
-	$(CFLAGS) \
+libekolabconvevolution_la_CFLAGS =	\
+	$(CFLAGS)			\
 	$(ADD_CFLAGS)
 
-libekolabconvevolution_la_LIBADD = \
-	$(CAMEL_LIBS) \
-	$(EDS_LIBS) \
+libekolabconvevolution_la_LIBADD =	\
+	$(CAMEL_LIBS)			\
+	$(EDS_LIBS)			\
 	$(GLIB_LIBS)
 
-noinst_HEADERS = \
-	evolution.h\
-	evolution-util.h \
+libekolabconvevolution_la_LDFLAGS =	\
+	-avoid-version			\
+	-static				\
+	$(NO_UNDEFINED)
+
+noinst_HEADERS =			\
+	evolution.h			\
+	evolution-util.h		\
 	priv-evolution.h
 
-noinstdir = \
+noinstdir =				\
 	$(pkgincludedir)
 
-EXTRA_DIST = \
+EXTRA_DIST =				\
 	$(noinst_HEADERS)
 
-AM_CPPFLAGS = \
-	$(CAMEL_CFLAGS) \
-	$(EDS_CFLAGS) \
+AM_CPPFLAGS =				\
+	$(CAMEL_CFLAGS)			\
+	$(EDS_CFLAGS)			\
 	$(GLIB_CFLAGS)
 
 ## File created by the gnome-build tools
-
diff --git a/src/libekolabconv/main/src/kolab/Makefile.am b/src/libekolabconv/main/src/kolab/Makefile.am
index ada0636..31768f2 100644
--- a/src/libekolabconv/main/src/kolab/Makefile.am
+++ b/src/libekolabconv/main/src/kolab/Makefile.am
@@ -1,51 +1,54 @@
-
-lib_LTLIBRARIES = \
+noinst_LTLIBRARIES =			\
 	libekolabconvkolab.la
 
-libekolabconvkolab_la_SOURCES = \
-	contact-i-to-k.c       \
-	contact-k-to-i.c       \
-	event-i-to-k.c       \
-	event-k-to-i.c       \
-	kolab-util.c       \
-	note-i-to-k.c       \
-	note-k-to-i.c       \
-	priv-common-i-to-k.c       \
-	priv-common-k-to-i.c       \
-	priv-incidence-i-to-k.c       \
-	priv-incidence-k-to-i.c       \
-	priv-kolab-preserve.c       \
-	task-i-to-k.c       \
+libekolabconvkolab_la_SOURCES =		\
+	contact-i-to-k.c		\
+	contact-k-to-i.c		\
+	event-i-to-k.c			\
+	event-k-to-i.c			\
+	kolab-util.c			\
+	note-i-to-k.c			\
+	note-k-to-i.c			\
+	priv-common-i-to-k.c		\
+	priv-common-k-to-i.c		\
+	priv-incidence-i-to-k.c		\
+	priv-incidence-k-to-i.c		\
+	priv-kolab-preserve.c		\
+	task-i-to-k.c			\
 	task-k-to-i.c
 
-libekolabconvkolab_la_CPPFLAGS = \
+libekolabconvkolab_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)
 
-libekolabconvkolab_la_CFLAGS = \
-	$(CFLAGS) \
+libekolabconvkolab_la_CFLAGS =		\
+	$(CFLAGS)			\
 	$(ADD_CFLAGS)
 
-libekolabconvkolab_la_LIBADD = \
-	$(EDS_LIBS) \
-	$(GLIB_LIBS) \
+libekolabconvkolab_la_LIBADD =		\
+	$(EDS_LIBS)			\
+	$(GLIB_LIBS)			\
 	$(CAMEL_LIBS)
 
-noinst_HEADERS = \
-	kolab.h \
-	kolab-constants.h \
-	kolab-util.h \
+libekolabconvkolab_la_LDFLAGS =		\
+	-avoid-version			\
+	-static				\
+	$(NO_UNDEFINED)
+
+noinst_HEADERS =			\
+	kolab.h				\
+	kolab-constants.h		\
+	kolab-util.h			\
 	priv-kolab.h
 
-noinstdir = \
+noinstdir =				\
 	$(pkgincludedir)
 
-EXTRA_DIST = \
+EXTRA_DIST =				\
 	$(noinst_HEADERS)
 
-AM_CPPFLAGS = \
-	$(EDS_CFLAGS) \
-	$(GLIB_CFLAGS) \
+AM_CPPFLAGS =				\
+	$(EDS_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	$(CAMEL_CFLAGS)
 
 ## File created by the gnome-build tools
-
diff --git a/src/libekolabconv/main/src/structs/Makefile.am b/src/libekolabconv/main/src/structs/Makefile.am
index f2fbd89..e909732 100644
--- a/src/libekolabconv/main/src/structs/Makefile.am
+++ b/src/libekolabconv/main/src/structs/Makefile.am
@@ -1,45 +1,48 @@
-
-lib_LTLIBRARIES = \
+noinst_LTLIBRARIES =			\
 	libekolabconvstructs.la
 
-libekolabconvstructs_la_SOURCES = \
-	common.c                 \
-	contact.c                 \
-	event.c                 \
-	incidence.c                 \
-	note.c                 \
+libekolabconvstructs_la_SOURCES =	\
+	common.c			\
+	contact.c			\
+	event.c				\
+	incidence.c			\
+	note.c				\
 	task.c
 
-libekolabconvstructs_la_CPPFLAGS = \
+libekolabconvstructs_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)
 
-libekolabconvstructs_la_CFLAGS = \
-	$(CFLAGS) \
+libekolabconvstructs_la_CFLAGS =	\
+	$(CFLAGS)			\
 	$(ADD_CFLAGS)
 
-libekolabconvstructs_la_LIBADD = \
-	$(CAMEL_LIBS) \
-	$(EDS_LIBS) \
+libekolabconvstructs_la_LIBADD =	\
+	$(CAMEL_LIBS)			\
+	$(EDS_LIBS)			\
 	$(GLIB_LIBS)
 
-noinst_HEADERS = \
-	common.h\
-	contact.h \
-	event.h \
-	incidence.h \
-	note.h \
+libekolabconvstructs_la_LDFLAGS =	\
+	-avoid-version			\
+	-static				\
+	$(NO_UNDEFINED)
+
+noinst_HEADERS =			\
+	common.h			\
+	contact.h			\
+	event.h				\
+	incidence.h			\
+	note.h				\
 	task.h
 
-noinstdir = \
+noinstdir =				\
 	$(pkgincludedir)
 
-EXTRA_DIST = \
+EXTRA_DIST =				\
 	$(noinst_HEADERS)
 
-AM_CPPFLAGS = \
-	$(CAMEL_CFLAGS) \
-	$(EDS_CFLAGS) \
+AM_CPPFLAGS =				\
+	$(CAMEL_CFLAGS)			\
+	$(EDS_CFLAGS)			\
 	$(GLIB_CFLAGS)
 
 ## File created by the gnome-build tools
-