Permalink
Browse files

Merge branch 'master' of github.com:oetiker/remOcular

  • Loading branch information...
2 parents 04cbe4e + 7ddfd4e commit 648ea89e4462f80f714afa095bd817129247c8de @oetiker committed Dec 13, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 backend/Makefile.am
  2. +1 −1 frontend/Makefile.am
View
@@ -39,7 +39,7 @@ dist_bin_SCRIPTS = $(BIN)
if BUILD_QOOXDOO_APP
-public/script/$(QX_CLASS).js: $(shell find ../frontend/source/class/$(QX_CLASS) -name "*.js")
+public/script/$(QX_CLASS).js: $(shell find ../frontend/source/class/$(QX_CLASS) -name "*.js") $(QOOXDOO_PATH)/framework/config.json
cd ../frontend && $(QOOXDOO_PATH)/tool/bin/generator.py -m QOOXDOO_PATH:$(QOOXDOO_PATH) -m CACHE:./cache -m BUILD_PATH:../backend/public build
endif
View
@@ -30,7 +30,7 @@ lint:
pretty:
$(QOOXDOO_PATH)/tool/bin/generator.py -m QOOXDOO_PATH:$(QOOXDOO_PATH) -m CACHE:./cache pretty
-source/script/remocular.js: $(shell find source/class/remocular -name "*.js")
+source/script/remocular.js: $(shell find source/class/remocular -name "*.js") $(QOOXDOO_PATH)/framework/config.json
$(QOOXDOO_PATH)/tool/bin/generator.py -m QOOXDOO_PATH:$(QOOXDOO_PATH) -m CACHE:./cache source
endif

0 comments on commit 648ea89

Please sign in to comment.