From ad7f2fc67376f4fbfe81047273de12f7926f0b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Tue, 16 Aug 2005 16:21:09 +0000 Subject: [PATCH] =?UTF-8?q?symlink.sh:=20Temporarily=20disable=20xkbdata,?= =?UTF-8?q?=20add=20type1mod.c=20Tue=20Aug=2016=2012:09:09=202005=20S?= =?UTF-8?q?=C3=B8ren=20Sandmann=20=20Add=20ft=20and?= =?UTF-8?q?=20type1=20modules.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 4 ++++ hw/xfree86/dixmods/Makefile.am | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8ecbebfd9..e12f49b97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 16 12:09:09 2005 Søren Sandmann + + * hw/xfree86/dixmods/Makefile.am: Add ft and type1 modules. + Mon Aug 15 15:41:26 2005 Søren Sandmann * hw/xfree86/dixmods/extmod/Makefile.am (libextmod_la_LIBADD): diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 7283e2bcc..3b1130020 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -18,6 +18,8 @@ module_LTLIBRARIES = libafb.la \ libmfb.la \ librecord.la \ libshadow.la \ + libfreetype.la \ + libtype1.la \ $(GLXMODS) AM_CFLAGS = @XORG_CFLAGS@ @@ -88,4 +90,10 @@ libshadow_la_LDFLAGS = -avoid-version libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la libshadow_la_SOURCES = shmodule.c +libfreetype_la_LDFLAGS = -avoid-version +libfreetype_la_SOURCES = ftmodule.c + +libtype1_la_LDFLAGS = -avoid-version +libtype1_la_SOURCES = type1mod.c + libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c