diff --git a/src/conio/GNUmakefile b/src/conio/GNUmakefile index d44229676386e872f0a41db244b1b25b4b5391de..ce3279e439177100fdf32fe6ed030ab984bac6da 100644 --- a/src/conio/GNUmakefile +++ b/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) diff --git a/src/conio/Makefile b/src/conio/Makefile index 8e175bbbadca8cc615050d962a774c7f2072dd11..a9ba2718a52a7741ada1df0f8b325bfc93e44b13 100644 --- a/src/conio/Makefile +++ b/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 diff --git a/src/conio/objects.mk b/src/conio/objects.mk index f52d79f50655d81670b6f9216aa15304734dbf40..4420d44e24c368420072fdec42d47d8f220f5385 100644 --- a/src/conio/objects.mk +++ b/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)