move host based default settings to core as tehy are not frontend dependant

This commit is contained in:
Vincent Sanders 2014-12-21 16:22:54 +00:00
parent 193a5c80b7
commit e467077a21
2 changed files with 30 additions and 19 deletions

View File

@ -100,10 +100,39 @@ CXXFLAGS :=
# Default installation/execution prefix
PREFIX ?= /usr/local
# Incude defaults specific to a TARGET
# ----------------------------------------------------------------------------
# Option overrides determined by HOST relating to all versions of NetSurf
# ----------------------------------------------------------------------------
# Configuration overrides for Mac OS X
ifeq ($(HOST),macosx)
NETSURF_USE_LIBICONV_PLUG := NO
NETSURF_USE_HARU_PDF := NO
endif
# Configuration overrides for OpenBSD
ifeq ($(HOST),OpenBSD)
NETSURF_USE_LIBICONV_PLUG := NO
NETSURF_USE_HARU_PDF := NO
endif
# Configuration overrides for FreeBSD
ifeq ($(HOST),FreeBSD)
NETSURF_USE_LIBICONV_PLUG := NO
NETSURF_USE_HARU_PDF := NO
endif
# ----------------------------------------------------------------------------
# Option overrides determined by specific TARGET
# ----------------------------------------------------------------------------
-include $(TARGET)/Makefile.defaults
# ----------------------------------------------------------------------------
# Include any local configuration
# ----------------------------------------------------------------------------
ifneq ($(MAKEFILE_DEFAULTS_FINISHED),)
$(error Makefile.defaults has been double-included. If you did something utterly brain-dead such as copying Makefile.defaults to Makefile.config then you deserve all the pain you can imagine. Do NOT do that. Why not read the comments at the top of Makefile.defaults. They are there to help you, you numpty)
endif

View File

@ -24,24 +24,6 @@ NETSURF_USE_ROSPRITE := AUTO
# Enable building the source object cache filesystem based backing store.
NETSURF_FS_BACKING_STORE := YES
# Configuration overrides for Mac OS X
ifeq ($(HOST),macosx)
NETSURF_USE_LIBICONV_PLUG := NO
NETSURF_USE_HARU_PDF := NO
endif
# Configuration overrides for OpenBSD
ifeq ($(HOST),OpenBSD)
NETSURF_USE_LIBICONV_PLUG := NO
NETSURF_USE_HARU_PDF := NO
endif
# Configuration overrides for FreeBSD
ifeq ($(HOST),FreeBSD)
NETSURF_USE_LIBICONV_PLUG := NO
NETSURF_USE_HARU_PDF := NO
endif
# Set default GTK version to build for (2 or 3)
NETSURF_GTK_MAJOR := 2