From 3a87b1447050fd4e402f991888dd2c4dab094bc5 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Sat, 17 Nov 2012 11:26:29 +0100
Subject: [PATCH] Use libtool libraries.

This simplifies linking.
---
 frontend/Makefile.am |   2 +-
 lib/Makefile.am      | 110 +++++++++++++++++++++++++++------------------------
 2 files changed, 59 insertions(+), 53 deletions(-)
 rewrite lib/Makefile.am (74%)

diff --git a/frontend/Makefile.am b/frontend/Makefile.am
index ca51df3..f5aedbe 100644
--- a/frontend/Makefile.am
+++ b/frontend/Makefile.am
@@ -26,7 +26,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib \
               -I$(top_builddir)/gnulib/src \
               -I$(top_srcdir)/gnulib/src \
               $(FREETYPE_CPPFLAGS)
-LDADD = $(top_builddir)/lib/libttfautohint.a \
+LDADD = $(top_builddir)/lib/libttfautohint.la \
         $(top_builddir)/gnulib/src/libgnu.la \
         $(LTLIBINTL) \
         $(LTLIBTHREAD) \
diff --git a/lib/Makefile.am b/lib/Makefile.am
dissimilarity index 74%
index 643a40c..719c025 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,52 +1,58 @@
-## Makefile.am
-
-# Copyright (C) 2011-2012 by Werner Lemberg.
-#
-# This file is part of the ttfautohint library, and may only be used,
-# modified, and distributed under the terms given in `COPYING'.  By
-# continuing to use, modify, or distribute this file you indicate that you
-# have read `COPYING' and understand and accept it fully.
-#
-# The file `COPYING' mentioned in the previous paragraph is distributed
-# with the ttfautohint library.
-
-AM_CPPFLAGS = $(FREETYPE_CPPFLAGS)
-
-noinst_LIBRARIES = libttfautohint.a \
-                   libnumberset.a
-
-libnumberset_a_SOURCES = numberset.c numberset.h
-libttfautohint_a_SOURCES = ta.h \
-                           tabytecode.c tabytecode.h \
-                           tacvt.c \
-                           tadsig.c \
-                           tadummy.c tadummy.h \
-                           taerror.c \
-                           tafile.c \
-                           tafont.c \
-                           tafpgm.c \
-                           tagasp.c \
-                           tagloadr.c tagloadr.h \
-                           taglobal.c taglobal.h \
-                           taglyf.c \
-                           tagpos.c \
-                           tahints.c tahints.h \
-                           tahmtx.c \
-                           talatin.c talatin.h \
-                           taloader.c taloader.h \
-                           taloca.c \
-                           tamaxp.c \
-                           taname.c \
-                           tapost.c \
-                           taprep.c \
-                           tasfnt.c \
-                           tasort.c tasort.h \
-                           tatables.c tatables.h \
-                           tatime.c \
-                           tattc.c \
-                           tattf.c \
-                           tatypes.h \
-                           ttfautohint.c ttfautohint.h ttfautohint-errors.h
-libttfautohint_a_LIBADD = libnumberset.a
-
-## end of Makefile.am
+## Makefile.am
+
+# Copyright (C) 2011-2012 by Werner Lemberg.
+#
+# This file is part of the ttfautohint library, and may only be used,
+# modified, and distributed under the terms given in `COPYING'.  By
+# continuing to use, modify, or distribute this file you indicate that you
+# have read `COPYING' and understand and accept it fully.
+#
+# The file `COPYING' mentioned in the previous paragraph is distributed
+# with the ttfautohint library.
+
+AM_CPPFLAGS = $(FREETYPE_CPPFLAGS)
+
+noinst_LTLIBRARIES = \
+  libttfautohint.la \
+  libnumberset.la
+
+libnumberset_la_SOURCES = \
+  numberset.c numberset.h
+
+libttfautohint_la_SOURCES = \
+  ta.h \
+  tabytecode.c tabytecode.h \
+  tacvt.c \
+  tadsig.c \
+  tadummy.c tadummy.h \
+  taerror.c \
+  tafile.c \
+  tafont.c \
+  tafpgm.c \
+  tagasp.c \
+  tagloadr.c tagloadr.h \
+  taglobal.c taglobal.h \
+  taglyf.c \
+  tagpos.c \
+  tahints.c tahints.h \
+  tahmtx.c \
+  talatin.c talatin.h \
+  taloader.c taloader.h \
+  taloca.c \
+  tamaxp.c \
+  taname.c \
+  tapost.c \
+  taprep.c \
+  tasfnt.c \
+  tasort.c tasort.h \
+  tatables.c tatables.h \
+  tatime.c \
+  tattc.c \
+  tattf.c \
+  tatypes.h \
+  ttfautohint.c ttfautohint.h ttfautohint-errors.h
+
+libttfautohint_la_LIBADD = \
+  libnumberset.la
+
+## end of Makefile.am
-- 
2.11.4.GIT