From 4b77821c24423fc8585434af0aac6cd2a19fda9f Mon Sep 17 00:00:00 2001 From: ccd0 Date: Wed, 20 Apr 2016 06:39:45 -0700 Subject: [PATCH] Improve variable names. --- Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index a48c0bc59..ca65909ea 100644 --- a/Makefile +++ b/Makefile @@ -31,21 +31,18 @@ $(eval $(shell node tools/pkgvars.js)) # must be read in when needed to prevent out-of-date version version = $(shell node -p "JSON.parse(require('fs').readFileSync('version.json')).version") -capitalized = $(filter-out a,$(foreach x,$1,$(subst a $(x),,$(sort a $(x))))) - -parts := \ +source_directories := \ globals config css platform classes \ - $(sort $(call capitalized, \ - $(subst src/,,$(wildcard src/*)) \ - )) \ + Archive Filtering General Images Linkification \ + Menu Miscellaneous Monitoring Posting Quotelinks \ main # remove extension when sorting so X.coffee comes before X.Y.coffee -sources_part = \ +sort_directory = \ $(subst !c,.coffee,$(subst !j,.js,$(sort $(subst .coffee,!c,$(subst .js,!j, \ $(wildcard src/$1/*.coffee src/$1/*.js)))))) -sources := $(foreach p,$(parts),$(call sources_part,$(p))) +sources := $(foreach d,$(source_directories),$(call sort_directory,$(d))) uses_tests_enabled := \ src/classes/Post.coffee \