From b69a330e3e3edd14fcbcca7b55817cbf7c47c4e1 Mon Sep 17 00:00:00 2001 From: Alexander Early Date: Sat, 2 Jun 2018 22:06:01 -0700 Subject: optimize makefile, fix tests --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a5a0422..a497465 100644 --- a/Makefile +++ b/Makefile @@ -15,17 +15,17 @@ BUILD_ES = build-es DIST = dist JS_INDEX = lib/index.js SCRIPTS = ./support -JS_SRC = $(shell find lib/ -type f -name '*.js') lib/index.js -INDEX_SRC = $(shell find lib/ -type f -name '*.js' | grep -v 'index') $(SCRIPTS)/index-template.js $(SCRIPTS)/aliases.json ${SCRIPTS}/generate-index.js -LINT_FILES = lib/ test/ $(shell find perf/ -maxdepth 2 -type f) $(shell find support/ -maxdepth 2 -type f -name "*.js") karma.conf.js - -UMD_BUNDLE = $(BUILDDIR)/dist/async.js -UMD_BUNDLE_MIN = $(BUILDDIR)/dist/async.min.js -UMD_BUNDLE_MAP = $(BUILDDIR)/dist/async.min.map -ALIAS_ES = $(shell node $(SCRIPTS)/list-aliases.js build-es/) -ES_MODULES = $(patsubst lib/%.js, build-es/%.js, $(JS_SRC)) $(ALIAS_ES) -ALIAS_CJS = $(shell node $(SCRIPTS)/list-aliases.js build/) -CJS_MODULES = $(patsubst lib/%.js, build/%.js, $(JS_SRC)) $(ALIAS_CJS) +JS_SRC := $(shell find lib/ -type f -name '*.js') lib/index.js +INDEX_SRC := $(filter-out $(JS_SRC),$(JS_INDEX)) $(SCRIPTS)/index-template.js $(SCRIPTS)/aliases.json ${SCRIPTS}/generate-index.js +LINT_FILES := lib/ test/ $(shell find perf/ -maxdepth 2 -type f) $(shell find support/ -maxdepth 2 -type f -name "*.js") karma.conf.js + +UMD_BUNDLE := $(BUILDDIR)/dist/async.js +UMD_BUNDLE_MIN := $(BUILDDIR)/dist/async.min.js +UMD_BUNDLE_MAP := $(BUILDDIR)/dist/async.min.map +ALIAS_ES := $(shell $(SCRIPTS)/list-aliases.js build-es/) +ALIAS_CJS := $(patsubst build-es/%, build/%, $(ALIAS_ES)) +ES_MODULES := $(patsubst lib/%.js, build-es/%.js, $(JS_SRC)) $(ALIAS_ES) +CJS_MODULES := $(patsubst lib/%.js, build/%.js, $(JS_SRC)) $(ALIAS_CJS) all: clean lint build test -- cgit v1.2.1