Since cterm uses the fontdata all over the place unconditionally (Should

this be fixed), we need allfonts to be included for all ciolib builds.

src/conio/GNUmakefile

@@ -16,11 +16,6 @@ endif
 ifdef WITH_SDL
  OBJS	+=	$(MTOBJODIR)$(DIRSEP)sdl_con$(OFILE)
  OBJS	+=	$(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
- OBJS	+=	$(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)
-else
- ifndef NO_X
-  OBJS	+=	$(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)
- endif
 endif
 
 ifeq ($(os),netbsd)

src/conio/Makefile

@@ -24,7 +24,6 @@ SRC_ROOT = ..
 OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)sdl_con$(OFILE) $(MTOBJODIR)$(DIRSEP)SDL_win32_main$(OFILE)
 OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
 !endif
-OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)
 
 #The following is necessary only when DLL-exporting wrapper functions
 !ifdef DLLIBS

src/conio/objects.mk

@@ -2,4 +2,5 @@ OBJS	=	$(MTOBJODIR)$(DIRSEP)ansi_cio$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)ciolib$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)cterm$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)vidmodes$(OFILE)\
+			$(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)mouse$(OFILE)