aboutsummaryrefslogtreecommitdiff
path: root/libXfont/src/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'libXfont/src/makefile')
-rw-r--r--libXfont/src/makefile14
1 files changed, 1 insertions, 13 deletions
diff --git a/libXfont/src/makefile b/libXfont/src/makefile
index 3e0cbfae0..3bc7fb3e7 100644
--- a/libXfont/src/makefile
+++ b/libXfont/src/makefile
@@ -46,16 +46,6 @@ FC_DIR = fc
FC_LIB = fc/libfc.la
endif
-if XFONT_TYPE1
-TYPE1_DIR = Type1
-TYPE1_LIB = Type1/libtype1.la
-endif
-
-if XFONT_SPEEDO
-SPEEDO_DIR = Speedo
-SPEEDO_LIB = Speedo/libspeedo.la
-endif
-
UTIL_DIR = util
UTIL_LIB = util/libutil.la
@@ -64,13 +54,11 @@ STUBS_DIR = stubs
SUBDIRS=\
$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
- $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) \
- $(TYPE1_DIR) $(SPEEDO_DIR)
+ $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR)
libXfont_la_LIBADD = \
$(FONTFILE_LIB) $(FREETYPE_LIB) $(BITMAP_LIB) \
$(BUILTINS_LIB) $(FC_LIB) $(UTIL_LIB) $(STUBS_LIB) \
- $(TYPE1_LIB) $(SPEEDO_LIB) \
$(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS)
libXfont_la_SOURCES = dummy.c