From 6ad900d99bbbe1fd5987c380835b907e51d41eda Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <gilles.dartiguelongue@esiee.org>
Date: Sat, 10 Mar 2012 15:59:51 +0100
Subject: [PATCH 1/3] Use libtool intermediate library instead of static
 archive

---
 configure.in               |    4 ++--
 src/common/Makefile.am     |    4 ++--
 src/time/Makefile.am       |    4 ++--
 src/time/e-map/Makefile.am |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index c266d02..2d60648 100644
--- a/configure.in
+++ b/configure.in
@@ -237,12 +237,12 @@ GST_DEPRECATED_FLAGS=""
 GST_LIBS="$GST_DEPENDS_LIBS $POLKIT_GTK_LIBS"
 GST_CFLAGS="$GST_DEPENDS_CFLAGS $POLKIT_GTK_CFLAGS $GST_DEPRECATED_FLAGS"
 
-GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS"
+GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.la $GST_LIBS"
 GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS"
 
 GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"
 GST_TOOL_EXTRA_DIST="\$(toolpixmaps) \$(desktop).in.in" 
-GST_TOOL_DEPENDENCIES="\$(top_builddir)/src/common/libsetuptool.a"
+GST_TOOL_DEPENDENCIES="\$(top_builddir)/src/common/libsetuptool.la"
 
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_CFLAGS)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 6698b4d..c39c286 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/DirsMakefile
 
-noinst_LIBRARIES = libsetuptool.a
+noinst_LTLIBRARIES = libsetuptool.la
 
 INCLUDES += \
 	$(GST_CFLAGS) \
@@ -10,7 +10,7 @@ INCLUDES += \
 	-DPREFIX=\""$(prefix)"\" \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
-libsetuptool_a_SOURCES = \
+libsetuptool_la_SOURCES = \
 	gst-dialog.c		gst-dialog.h \
 	gst-tool.c		gst-tool.h \
 	gst-platform-dialog.c	gst-platform-dialog.h \
diff --git a/src/time/Makefile.am b/src/time/Makefile.am
index e9adaf4..6ff332f 100644
--- a/src/time/Makefile.am
+++ b/src/time/Makefile.am
@@ -15,8 +15,8 @@ INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS)
 CLEANFILES = $(GST_TOOL_CLEANFILES)
 EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
 
-time_admin_LDADD = $(GST_TOOL_LIBS) $(DBUS_LIBS) ./e-map/libemap.a
-time_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES) ./e-map/libemap.a
+time_admin_LDADD = $(GST_TOOL_LIBS) $(DBUS_LIBS) ./e-map/libemap.la
+time_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES) ./e-map/libemap.la
 time_admin_SOURCES = \
 	time-tool.c	time-tool.h \
 	tz.c		tz.h \
diff --git a/src/time/e-map/Makefile.am b/src/time/e-map/Makefile.am
index 5828690..9d04963 100644
--- a/src/time/e-map/Makefile.am
+++ b/src/time/e-map/Makefile.am
@@ -20,13 +20,13 @@ e-map-marshal.c: e-map-marshal.list e-map-marshal.h
 
 $(e_map_la_OBJECTS): e-map-marshal.h
 
-noinst_LIBRARIES = libemap.a
+noinst_LTLIBRARIES = libemap.la
 
-#libemap_a_CFLAGS =
+#libemap_la_CFLAGS =
 
 BUILT_SOURCES= e-map-marshal.c e-map-marshal.h
 
-libemap_a_SOURCES = \
+libemap_la_SOURCES = \
 	e-map.c e-map.h \
 	$(BUILT_SOURCES)
 
-- 
1.7.8.5