diff options
| author | Memphiz <memphis@machzwo.de> | 2014-06-02 19:17:15 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2014-06-03 11:11:55 +0200 |
| commit | e7e4c7b4e2bba33ae9108a18493e397a8f49c68f (patch) | |
| tree | 01363b0ee309f51153e4cefafe7af0859303e1cf /codegenerator.mk | |
| parent | b5e06ca5714136ea774f511e7ead496679572eeb (diff) | |
[jsonbuilder] - do it properly ...
Diffstat (limited to 'codegenerator.mk')
| -rw-r--r-- | codegenerator.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/codegenerator.mk b/codegenerator.mk index d9d3c9aa0b..5ecb0c0273 100644 --- a/codegenerator.mk +++ b/codegenerator.mk @@ -22,7 +22,7 @@ GENERATED_JSON = $(INTERFACES_DIR)/json-rpc/ServiceDescription.h addons/xbmc.jso ifeq ($(wildcard $(JSON_BUILDER)),) JSON_BUILDER = $(shell which JsonSchemaBuilder) ifeq ($(JSON_BUILDER),) - JSON_BUILDER = tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder + JSON_BUILDER = tools/depends/native/JsonSchemaBuilder/bin/JsonSchemaBuilder endif endif @@ -75,7 +75,11 @@ $(GENERATED_JSON): $(JSON_BUILDER) @echo Jsonbuilder: $(JSON_BUILDER) make -C $(INTERFACES_DIR)/json-rpc $(notdir $@) -ifneq ($(CROSS_COMPILING), yes) $(JSON_BUILDER): - make -C $(dir $@) +ifeq ($(BOOTSTRAP_FROM_DEPENDS), yes) + @echo JsonSchemaBuilder not found. You didn\'t build depends. Check docs/README.\<yourplatform\> + @false +else +#build json builder - ".." because makefile is in the parent dir of "bin" + make -C $(abspath $(dir $@)..) endif |