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 --- cocoa/Makefile.target | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cocoa') diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index fe49930c4..92e08739e 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -118,9 +118,10 @@ S_TABBAR := \ S_COCOA := $(addprefix cocoa/,$(S_COCOA)) S_TABBAR := $(addprefix cocoa/PSMTabBarControl/,$(S_TABBAR)) -# complete source file list -SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_COCOA) $(S_TABBAR) -SOURCES := $(addprefix $(shell pwd)/,$(SOURCES)) +# This is the final source build list +# Note this is deliberately *not* expanded here as common and image +# are not yet available +SOURCES = $(addprefix $(shell pwd)/,$(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_COCOA) $(S_TABBAR)) # Since we prefix the sources with the pwd, also create a special # prefixed rule so that the testament is run @@ -169,7 +170,7 @@ $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(1) $$(OBJROOT)/created $(VQ)echo Compiling XIB $(1) for language $(2) $(Q)mkdir -p $$(OBJROOT)/$(2).lproj $(Q)cocoa/compile-xib.sh $(DEVELOPER_PATH) cocoa/res/$(1) $(2) $$@ - + ifeq ($(wildcard cocoa/res/$(2).lproj/$(1).strings),cocoa/res/$(2).lproj/$(1).strings) $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(2).lproj/$(1).strings endif -- cgit v1.2.3