diff options
author | Vincent Sanders <vince@kyllikki.org> | 2015-08-03 15:16:11 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2015-08-03 15:16:11 +0100 |
commit | fcdec4efc70864533ad940ea0bcb7dd4ea13f41a (patch) | |
tree | e32abde3baf431d9b05edab055d3a03ce9322ab8 | |
parent | 11b6a979ac323aa0baf1efffe7a088a616cef0f9 (diff) | |
download | netsurf-fcdec4efc70864533ad940ea0bcb7dd4ea13f41a.tar.gz netsurf-fcdec4efc70864533ad940ea0bcb7dd4ea13f41a.tar.bz2 |
Improve genbind calling and makefile handling in general
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | javascript/Makefile | 14 |
2 files changed, 12 insertions, 3 deletions
@@ -783,7 +783,6 @@ $(eval $(foreach SOURCE,$(filter %.m,$(SOURCES)), \ ifeq ($(filter $(MAKECMDGOALS),clean test coverage),) -include $(sort $(addprefix $(DEPROOT)/,$(DEPFILES))) --include $(D_JSAPI_BINDING) endif # And rules to build the objects themselves... diff --git a/javascript/Makefile b/javascript/Makefile index eaeb8b9d9..1acca80bd 100644 --- a/javascript/Makefile +++ b/javascript/Makefile @@ -58,12 +58,22 @@ S_JAVASCRIPT += content.c jsapi.c fetcher.c $(addprefix jsapi/,$(S_JSAPI)) $(eval $(foreach V,$(filter JSAPI_BINDING_%,$(.VARIABLES)),$(call convert_jsapi_binding,$($(V)),$(OBJROOT)/$(patsubst JSAPI_BINDING_%,%,$(V)).c,$(OBJROOT)/$(patsubst JSAPI_BINDING_%,%,$(V)).h,$(patsubst JSAPI_BINDING_%,%,$(V))_jsapi))) +ifeq ($(filter $(MAKECMDGOALS),clean test coverage),) +-include $(D_JSAPI_BINDING) +endif + else ifeq ($(NETSURF_USE_DUKTAPE),YES) -JUNK:=$(shell mkdir -p $(OBJROOT)/duktape) -JUNK:=$(shell nsgenbind -v -g -D -I javascript/WebIDL javascript/duktape/netsurf.bnd $(OBJROOT)/duktape) +$(OBJROOT)/duktape/Makefile: javascript/duktape/netsurf.bnd + $(Q)mkdir -p $(OBJROOT)/duktape + $(VQ)echo " GENBIND: $<" + $(Q)nsgenbind -v -g -D -I javascript/WebIDL $< $(OBJROOT)/duktape + + +ifeq ($(filter $(MAKECMDGOALS),clean test coverage),) include $(OBJROOT)/duktape/Makefile +endif S_JSAPI_BINDING:=$(addprefix $(OBJROOT)/duktape/,$(NSGENBIND_SOURCES)) |