From 698077fba6bc8d9280d005442779f68a0dd07ddc Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashmew2@gmail.com>
Date: Sat, 13 May 2017 23:15:38 +0200
Subject: Get rid of internal font building from Makefile

---
 frontends/kolibrios/Makefile | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index 716166c66..fc065d1b6 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -4,9 +4,6 @@ DMACROS := -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE
 KOL_OTHER_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/libpng/ -I$(HOME)/kolibrios/contrib/sdk/sources/zlib -I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include -I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include -I$(HOME)/kolibrios/contrib/sdk/sources/libjpeg
 
 CFLAGS += $(KOL_OTHER_INCLUDES) $(DMACROS) -std=c99  -g
-
-# CFLAGS += '-DNETSURF_KOLIBRI_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"'
-# CFLAGS += '-DKOLIBRIOS_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"'
 CFLAGS += '-DNETSURF_USE_KOLIBRI_HTTPLIB'
 ##########################################################################
 # Only for FB compat with kolibri. Get rid soon.
@@ -89,31 +86,6 @@ endef
 S_IMAGES :=
 $(eval $(foreach V,$(filter KOLIBRI_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V)),$(OBJROOT)/image-$(patsubst KOLIBRI_IMAGE_%,%,$(V)).c,$(patsubst KOLIBRI_IMAGE_%,%,$(V)))))
 
-# Internal fonts to generate
-KOLIBRI_FONT_internal_ns-sans := $(FRONTEND_SOURCE_DIR)/res/fonts/glyph_data
-
-# Internal font conversion
-$(TOOLROOT)/convert_font: $(TOOLROOT)/created $(FRONTEND_SOURCE_DIR)/fb/convert_font.c
-	$(VQ)echo " HOST CC: $@"
-	$(Q)$(HOST_CC) -o $@ $(FRONTEND_SOURCE_DIR)/fb/convert_font.c
-
-# 1: input file
-# 2: output source code file
-# 3: output header file
-# 4: font name
-define convert_font
-
-S_FONTS += $(2)
-$(warning Adding to S_FONTS : $(2))
-$(2): $(1) $(TOOLROOT)/convert_font
-	$(VQ)echo "    FONT: $(1) ($(4))"
-	$(Q)$(TOOLROOT)/convert_font -d -H $(3) $(1) $(2)
-endef
-
-S_FONTS :=
-# $(eval $(foreach V,$(filter KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,$(.VARIABLES)),$(call convert_font,$($(V)),$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).c,$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).h,$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)))))
-
-# $(error $(foreach V,$(filter KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,$(.VARIABLES)),$(call convert_font,$($(V)),$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).c,$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).h,$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)))))
 # non optional pkg-configed libs
 #$(eval $(call pkg_config_find_and_add,libcurl,Curl ))
 #$(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
@@ -139,7 +111,7 @@ S_FRAMEBUFFER += $(addprefix fb/fbtk/,$(S_FRAMEBUFFER_FBTK))
 S_KOLIBRIOS += $(S_FRAMEBUFFER)
 S_FRONTEND := $(S_KOLIBRIOS)
 
-SOURCES =  $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) $(S_IMAGES) $(S_FONTS)
+SOURCES =  $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) $(S_IMAGES)
 
 EXETARGET := nskolibrios
 
-- 
cgit v1.2.3