From 34080c56ff59f27cdc29ffce969e8d2ce5edcdf2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 19 Mar 2018 14:15:38 -0400 Subject: Use requirejs to load JS modules; use yarn to get requirejs --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b16d2ed..f723132 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ -srcs = $(shell find public-src -not -type d) +srcs = $(shell find public-src -name 3rd-party -prune -o -not -type d -not -name '*.log' -print) outs = $(patsubst public-src/%,public/%,\ $(patsubst %.scss,%.css,\ $(patsubst %.gen,%,\ $(srcs)))) all: $(outs) +all: public/3rd-party .PHONY: all NET-%: @@ -56,6 +57,11 @@ public-src/jarmon-depenencies: jarmon/docs/examples/assets/js/dependencies.js jarmon/docs/examples/assets/js/dependencies.js: FORCE $(MAKE) -C jarmon docs/examples/assets/js/dependencies.js +public-src/3rd-party/yarn.LICENSES.txt: bin/yarn-bower public-src/3rd-party/package.json $(wildcard public-src/3rd-party/yarn.lock) + bin/yarn-bower install + bin/yarn-bower licenses generate-disclaimer > $@ +public/3rd-party: public-src/3rd-party/yarn.LICENSES.txt + jquery-ver=1.6.3 flot-ver=0.8.3 jsrrd-ver=1.1.1 -- cgit v1.2.3