summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2011-08-28 14:29:15 +0000
committerVincent Sanders <vince@netsurf-browser.org>2011-08-28 14:29:15 +0000
commitcd554e6f1e42c440c791845a1a635415b23a19a2 (patch)
tree7079b2d0e4e4a24c9f5687d6cee9ce3b0c93b2f9 /Makefile
parent401072e305c152b42d99d94b2283cf928562f132 (diff)
downloadnetsurf-cd554e6f1e42c440c791845a1a635415b23a19a2.tar.gz
netsurf-cd554e6f1e42c440c791845a1a635415b23a19a2.tar.bz2
make image content handlers build conditional from teh makefile
svn path=/trunk/netsurf/; revision=12673
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 9 insertions, 4 deletions
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