[passepartout] build libps.la and libfonts.la with libtool

[Sven Herzberg <herzi src gnome org>]

commit 94fb7ae792a1239e6ef3af0c7ffb9a442051c9c6
Author: Sven Herzberg <herzi lanedo com>
Date:   Fri Apr 24 09:35:54 2009 +0200

    build libps.la and libfonts.la with libtool
    
    * .gitignore: ignore libtool objects, libtool archives and libtool scripts
    * configure.ac: depend on libtool
    * src/fonts/Makefile.am,
    * src/ps/Makefile.am: build the libraries with libtool
    * src/pptout/Makefile.am,
    * src/xml2ps/Makefile.am: link against these new libraries
---
 .gitignore             |    7 +++++++
 configure.ac           |    2 +-
 src/fonts/Makefile.am  |   14 ++++++++------
 src/pptout/Makefile.am |    3 ++-
 src/ps/Makefile.am     |   20 ++++++++++----------
 src/xml2ps/Makefile.am |    2 +-
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9d65b5..e67253e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,23 @@
 *~
 *.a
 *.desktop
+*.la
+*.lo
 *.o
 *autom4te.cache
 .deps
 aclocal.m4
+config.guess
 config.log
 config.status
+config.sub
 configure
 depcomp
+gnome-doc-utils.make
 install-sh
 intltool-*
+libtool
+ltmain.sh
 Makefile
 Makefile.in
 missing
diff --git a/configure.ac b/configure.ac
index 215f180..7bd3d4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} --enable-compile-warning
 
 # Checks for programs.
 AC_PROG_CXX
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 
 # AC_APPLY_RPATH(LIBS)
 # --------------------
diff --git a/src/fonts/Makefile.am b/src/fonts/Makefile.am
index b321762..29f63f6 100644
--- a/src/fonts/Makefile.am
+++ b/src/fonts/Makefile.am
@@ -1,13 +1,15 @@
-noinst_LIBRARIES = libfonts.a
+noinst_LTLIBRARIES=\
+	libfonts.la \
+	$(NULL)
 
 dist_noinst_HEADERS = fontinfo.hh fontmanager.hh fontmetrics.hh afm.hh	\
 		freetype.hh
 
-libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
+libfonts_la_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
 
-libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
-
-# for Glib::ustring
-libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+libfonts_la_CPPFLAGS=\
+	-I$(top_srcdir)/src \
+	$(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) $(WARN_CFLAGS) \
+	$(NULL)
 
 #libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
diff --git a/src/pptout/Makefile.am b/src/pptout/Makefile.am
index 7eb931b..c1dfed9 100644
--- a/src/pptout/Makefile.am
+++ b/src/pptout/Makefile.am
@@ -47,7 +47,8 @@ passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
 	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS) $(WARN_CFLAGS)
 
 pptpartlibs= document/libdocument.a ../xml2ps/libxml2ps.a	\
-	../fonts/libfonts.a ../ps/libps.a			\
+	../fonts/libfonts.la \
+	../ps/libps.la \
 	../util/libpptutil.a widget/libwidget.a
 passepartout_LDADD=\
 	$(pptpartlibs) \
diff --git a/src/ps/Makefile.am b/src/ps/Makefile.am
index 0c721b5..2b19566 100644
--- a/src/ps/Makefile.am
+++ b/src/ps/Makefile.am
@@ -1,28 +1,28 @@
 bin_PROGRAMS = examinepdf
-noinst_LIBRARIES = libps.a
+noinst_LTLIBRARIES=libps.la
 
 dist_noinst_HEADERS = encode.h pdf.h unicode.h pfb2pfa.h misc.h wineps.h \
 		pdfparser.h type42.h
 
-libps_a_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
+libps_la_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
 		wineps.cc pdfparser.cc type42.cc
+libps_la_LIBADD=\
+	../fonts/libfonts.la \
+	$(NULL)
 
 examinepdf_SOURCES = examinepdf.cc
 
-libps_a_CPPFLAGS = -I$(top_srcdir)/src
+libps_la_CPPFLAGS = -I$(top_srcdir)/src
 
 # for Glib::ustring
-libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+libps_la_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 
-examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS) $(WARN_CFLAGS)
+examinepdf_CPPFLAGS = $(libps_la_CPPFLAGS) $(WARN_CFLAGS)
 examinepdf_LDADD=\
-	libps.a -L../fonts -lfonts libps.a -L../util -lpptutil \
+	libps.la ../fonts/libfonts.la libps.la -L../util -lpptutil \
 	$(FREETYPE_LIBS) \
 	$(GTKMM_LIBS) \
 	$(NULL)
-examinepdf_DEPENDENCIES = libps.a
-
-#libps_a_LIBADD = $(GTKMM_LIBS)
 
 TESTS = runtest
 check_PROGRAMS = runtest
@@ -30,5 +30,5 @@ 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 -L. -lps -L../util -lpptutil \
+runtest_LDADD = -L../testbed -lppttest libps.la -L../util -lpptutil \
 		$(GTKMM_LIBS)
diff --git a/src/xml2ps/Makefile.am b/src/xml2ps/Makefile.am
index 08c8bf8..e4ab54a 100644
--- a/src/xml2ps/Makefile.am
+++ b/src/xml2ps/Makefile.am
@@ -21,7 +21,7 @@ libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
 xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS) $(WARN_CFLAGS)
 
 xml2ps_LDADD=\
-	libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a \
+	libxml2ps.a ../fonts/libfonts.la ../ps/libps.la ../util/libpptutil.a \
 	$(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
 	$(NULL)