[passepartout] build libxml2ps.la with libtool

[Sven Herzberg <herzi src gnome org>]

commit 4100e0689c590495228b3062b4c64f2b2a93a407
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 30 10:19:31 2009 +0200

    build libxml2ps.la with libtool
    
    * configure.ac: disable static libraries (so we only build shared ones by
      default)
    * src/pptout/Makefile.am: link against the new libtool archive
    * src/xml2ps/Makefile.am: build libxml2ps.la with libtool
---
 configure.ac           |    1 +
 src/pptout/Makefile.am |    4 +++-
 src/xml2ps/Makefile.am |   36 ++++++++++++++++++++++++++----------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7bd3d4e..c88528f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} --enable-compile-warning
 
 # Checks for programs.
 AC_PROG_CXX
+AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 # AC_APPLY_RPATH(LIBS)
diff --git a/src/pptout/Makefile.am b/src/pptout/Makefile.am
index c1dfed9..8c05be6 100644
--- a/src/pptout/Makefile.am
+++ b/src/pptout/Makefile.am
@@ -46,7 +46,9 @@ passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
 passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
 	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS) $(WARN_CFLAGS)
 
-pptpartlibs= document/libdocument.a ../xml2ps/libxml2ps.a	\
+pptpartlibs=\
+	document/libdocument.a \
+	../xml2ps/libxml2ps.la \
 	../fonts/libfonts.la \
 	../ps/libps.la \
 	../util/libpptutil.a widget/libwidget.a
diff --git a/src/xml2ps/Makefile.am b/src/xml2ps/Makefile.am
index e4ab54a..9b2b60b 100644
--- a/src/xml2ps/Makefile.am
+++ b/src/xml2ps/Makefile.am
@@ -1,28 +1,44 @@
 bin_PROGRAMS = xml2ps
-
-noinst_LIBRARIES = libxml2ps.a
+lib_LTLIBRARIES=libxml2ps.la
 
 dist_noinst_HEADERS = blockcontainer.hh boundaries.hh canvas.hh		\
 		line.hh paragraph.hh typesetter.hh pagedstream.hh	\
 		pdfcanvas.hh pscanvas.hh psstream.hh xly.hh xcanvas.hh
 
-libxml2ps_a_SOURCES = paragraph.cc xly.cc typesetter.cc			\
+libxml2ps_la_LDFLAGS=\
+	-release "$(PACKAGE_VERSION)" \
+	$(NULL)
+libxml2ps_la_LIBADD=\
+	$(XMLPP_LIBS) \
+	$(NULL)
+libxml2ps_la_SOURCES=\
+	paragraph.cc \
+	typesetter.cc \
+	xly.cc \
 	  	blockcontainer.cc psstream.cc line.cc canvas.cc		\
 	  	pagedstream.cc pscanvas.cc boundaries.cc pdfcanvas.cc	\
 	  	xcanvas.cc
 
 xml2ps_SOURCES = main.cc
 
-libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
-
-libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
-		$(GNOMECANVAS_CFLAGS) $(WARN_CFLAGS)
+libxml2ps_la_CPPFLAGS=\
+	-I$(top_srcdir)/src \
+	$(XMLPP_CFLAGS) \
+	$(GTKMM_CFLAGS) \
+	$(GNOMECANVAS_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(NULL)
 
-xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS) $(WARN_CFLAGS)
+xml2ps_CPPFLAGS=$(libxml2ps_la_CPPFLAGS)
 
 xml2ps_LDADD=\
-	libxml2ps.a ../fonts/libfonts.la ../ps/libps.la ../util/libpptutil.a \
-	$(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
+	libxml2ps.la \
+	$(libxml2ps_la_LIBADD) \
+	../fonts/libfonts.la \
+	../ps/libps.la \
+	../util/libpptutil.a \
+	$(GTKMM_LIBS) \
+	$(GNOMECANVAS_LIBS) \
 	$(NULL)
 
 #install DTDs and XSLTs in $(datadir)/xml/passepartout/ (xmldir is defined in configure.ac)