summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-16 20:50:12 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-16 20:50:12 +0000
commitb96f539005da57273dc7e2bee13651de4eedf087 (patch)
treed56d61c92d58ede161b79f0de9fa51ad679bba81 /Makefile.am
parent01c8cee1736be252348306412ab56b2e03bf2678 (diff)
Add Type1 subdirectory to lib/Xfonts, update build system accordingly.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am16
1 files changed, 14 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 178e918..3f6fcee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,16 @@ FC_DIR = src/fc
FC_LIB = src/fc/libfc.la
endif
+if XFONT_TYPE1
+TYPE1_DIR = src/Type1
+TYPE1_LIB = src/Type1/libtype1.la
+endif
+
+# if XFONT_SPEEDO
+# SPEEDO_DIR = src/Speedo
+# SPEEDO_LIB = src/Speedo/libspeedo.la
+# endif
+
UTIL_DIR = src/util
UTIL_LIB = src/util/libutil.la
@@ -60,11 +70,13 @@ STUBS_LIB = src/stubs/libstubs.la
STUBS_DIR = src/stubs
SUBDIRS=$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
- $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR)
+ $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR) \
+ $(TYPE1_DIR) $(SPEEDO_DIR)
libXfont_la_LIBADD = $(FREETYPE_LIB) $(BITMAP_LIB) $(BUILTINS_LIB) \
$(FC_LIB) $(FONTFILE_LIB) $(UTIL_LIB) $(STUBS_LIB) \
- $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(FONTCACHE_LIB)
+ $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(FONTCACHE_LIB) \
+ $(TYPE_1_LIB) $(SPEEDO_LIB)
libXfont_la_SOURCES =