summaryrefslogtreecommitdiff
path: root/xc/lib/font/fontfile/Imakefile
diff options
context:
space:
mode:
Diffstat (limited to 'xc/lib/font/fontfile/Imakefile')
-rw-r--r--xc/lib/font/fontfile/Imakefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/xc/lib/font/fontfile/Imakefile b/xc/lib/font/fontfile/Imakefile
index a8684af81..01bfffb6a 100644
--- a/xc/lib/font/fontfile/Imakefile
+++ b/xc/lib/font/fontfile/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:36 cpqbld Exp $
-XCOMM $XFree86: xc/lib/font/fontfile/Imakefile,v 3.18 2001/01/17 19:43:29 dawes Exp $
+XCOMM $XFree86: xc/lib/font/fontfile/Imakefile,v 3.19 2001/08/13 21:46:47 dawes Exp $
#include <Server.tmpl>
@@ -38,6 +38,11 @@ XTRUETYPE_DEFINES = -DBUILD_XTRUETYPE
#endif
#endif
+#if FontencCompatibility
+ COMPAT_SRC = fontencc.c
+ COMPAT_OBJ = fontencc.o
+#endif
+
#if GzipFontCompression
GUNZIP_SRC = gunzip.c
GUNZIP_OBJ = gunzip.o
@@ -45,19 +50,21 @@ XTRUETYPE_DEFINES = -DBUILD_XTRUETYPE
#endif
ATTRIBDEFS = -DFONTDIRATTRIB
+FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\"
DEFINES = StrcasecmpDefines $(ATTRIBDEFS) \
$(SPEEDO_DEFINES) $(TYPE1_DEFINES) $(CID_DEFINES) \
- $(FREETYPE_DEFINES) $(XTRUETYPE_DEFINES) $(GZIP_DEFS)
+ $(FREETYPE_DEFINES) $(XTRUETYPE_DEFINES) $(FONTENCDEFS) \
+ $(GZIP_DEFS)
SRCS = dirfile.c fontdir.c fontfile.c fileio.c fontscale.c \
defaults.c bitsource.c register.c renderers.c bufio.c \
decompress.c filewr.c printerfont.c ffcheck.c \
- fontenc.c encparse.c $(GUNZIP_SRC)
+ fontenc.c encparse.c $(COMPAT_SRC) $(GUNZIP_SRC)
OBJS = dirfile.o fontdir.o fontfile.o fileio.o fontscale.o \
defaults.o bitsource.o register.o renderers.o bufio.o \
decompress.o filewr.o printerfont.o ffcheck.o \
- fontenc.o encparse.o $(GUNZIP_OBJ)
+ fontenc.o encparse.o $(COMPAT_OBJ) $(GUNZIP_OBJ)
#define DoNormalLib NormalLibFont
#define DoSharedLib SharedLibFont