From cd554e6f1e42c440c791845a1a635415b23a19a2 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 28 Aug 2011 14:29:15 +0000 Subject: make image content handlers build conditional from teh makefile svn path=/trunk/netsurf/; revision=12673 --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e1775429e..93a8a0e27 100644 --- a/Makefile +++ b/Makefile @@ -302,10 +302,12 @@ define pkg_config_find_and_add LDFLAGS += $$(shell $$(PKG_CONFIG) --libs $(2)) $$(NETSURF_FEATURE_$(1)_LDFLAGS) ifneq ($(MAKECMDGOALS),clean) $$(info M.CONFIG: $(3) ($(2)) auto-enabled (NETSURF_USE_$(1) := AUTO)) + NETSURF_USE_$(1) := YES endif else ifneq ($(MAKECMDGOALS),clean) $$(info M.CONFIG: $(3) ($(2)) auto-disabled (NETSURF_USE_$(1) := AUTO)) + NETSURF_USE_$(1) := NO endif endif else ifeq ($$(NETSURF_USE_$(1)),NO) @@ -373,21 +375,24 @@ CLEANS := clean-target clean-testament POSTEXES := # ---------------------------------------------------------------------------- -# General source file setup +# Target specific setup # ---------------------------------------------------------------------------- -include Makefile.sources +include $(TARGET)/Makefile.target # ---------------------------------------------------------------------------- -# Target specific setup +# General source file setup # ---------------------------------------------------------------------------- -include $(TARGET)/Makefile.target +include Makefile.sources # ---------------------------------------------------------------------------- # Source file setup # ---------------------------------------------------------------------------- +# Force exapnsion of source file list +SOURCES := $(SOURCES) + ifeq ($(SOURCES),) $(error Unable to build NetSurf, could not determine set of sources to build) endif -- cgit v1.2.3