[passepartout] build libpptutil.la with libtool

[Sven Herzberg <herzi src gnome org>]

commit d9a0e7a201f801ea48492fde98d9111d574a95c3
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 30 10:34:40 2009 +0200

    build libpptutil.la with libtool
    
    * src/util/Makefile.am: create another libtool archive
    * src/pptout/Makefile.am,
    * src/ps/Makefile.am,
    * src/xml2ps/Makefile.am: updated the build rules
---
 src/pptout/Makefile.am |    3 ++-
 src/ps/Makefile.am     |   13 +++++++++----
 src/util/Makefile.am   |   17 +++++++++++++----
 src/xml2ps/Makefile.am |    2 +-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/pptout/Makefile.am b/src/pptout/Makefile.am
index 8c05be6..d3a7aaf 100644
--- a/src/pptout/Makefile.am
+++ b/src/pptout/Makefile.am
@@ -51,7 +51,8 @@ pptpartlibs=\
 	../xml2ps/libxml2ps.la \
 	../fonts/libfonts.la \
 	../ps/libps.la \
-	../util/libpptutil.a widget/libwidget.a
+	../util/libpptutil.la \
+	widget/libwidget.a
 passepartout_LDADD=\
 	$(pptpartlibs) \
 	$(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
diff --git a/src/ps/Makefile.am b/src/ps/Makefile.am
index 2b19566..500e37a 100644
--- a/src/ps/Makefile.am
+++ b/src/ps/Makefile.am
@@ -19,7 +19,10 @@ libps_la_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 
 examinepdf_CPPFLAGS = $(libps_la_CPPFLAGS) $(WARN_CFLAGS)
 examinepdf_LDADD=\
-	libps.la ../fonts/libfonts.la libps.la -L../util -lpptutil \
+	libps.la \
+	../fonts/libfonts.la \
+	libps.la \
+	../util/libpptutil.la \
 	$(FREETYPE_LIBS) \
 	$(GTKMM_LIBS) \
 	$(NULL)
@@ -29,6 +32,8 @@ check_PROGRAMS = runtest
 runtest_SOURCES = test_glyphlist.cc
 runtest_CPPFLAGS = -I$(top_srcdir)/src
 runtest_CPPFLAGS += $(GTKMM_CFLAGS) $(WARN_CFLAGS)
-runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
-runtest_LDADD = -L../testbed -lppttest libps.la -L../util -lpptutil \
-		$(GTKMM_LIBS)
+runtest_LDADD=\
+	-L../testbed -lppttest \
+	libps.la \
+	../util/libpptutil.la \
+	$(GTKMM_LIBS)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 9b8a969..480a2a3 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,12 +1,16 @@
-noinst_LIBRARIES = libpptutil.a
+noinst_LTLIBRARIES=libpptutil.la
 
 dist_noinst_HEADERS = stringutil.h filesys.h warning.h os.h configfile.h \
 	valueunit.h units.h refcount.h matrix.h boundary.h		 \
 	rectboundary.h typeinfo.h barrier.h processman.h tempfile.h	 \
 	filewatcher.h vector.h filedescriptors.h cmdline.h xmlwrap.h
 
-libpptutil_a_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \
+libpptutil_la_SOURCES=\
 	configfile.cc \
+	filesys.cc \
+	os.cc \
+	stringutil.cc \
+	warning.cc \
 	matrix.cc boundary.cc rectboundary.cc typeinfo.cc barrier.cc \
 	processman.cc tempfile.cc filewatcher.cc filedescriptors.cc 	\
 	cmdline.cc xmlwrap.cc
@@ -19,5 +23,10 @@ check_PROGRAMS = runtest
 runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
 	test_boundary.cc test_procio.cc test_cmdline.cc
 runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
-runtest_DEPENDENCIES = $(noinst_LIBRARIES)
-runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
+runtest_LDADD=\
+	-L../testbed -lppttest \
+	libpptutil.la \
+	$(GTKMM_LIBS) \
+	$(GNOMECANVAS_LIBS) \
+	$(NULL)
+
diff --git a/src/xml2ps/Makefile.am b/src/xml2ps/Makefile.am
index 9b2b60b..f3b918b 100644
--- a/src/xml2ps/Makefile.am
+++ b/src/xml2ps/Makefile.am
@@ -36,7 +36,7 @@ xml2ps_LDADD=\
 	$(libxml2ps_la_LIBADD) \
 	../fonts/libfonts.la \
 	../ps/libps.la \
-	../util/libpptutil.a \
+	../util/libpptutil.la \
 	$(GTKMM_LIBS) \
 	$(GNOMECANVAS_LIBS) \
 	$(NULL)