Move setting of exclude flags to separate env vars

kgryte · kgryte · commit 6fb87074d355 · 2018-01-19T09:15:21.000-08:00
diff --git a/tools/make/lib/ls/Makefile b/tools/make/lib/ls/Makefile
@@ -260,13 +260,22 @@ FIND_SOURCES_EXCLUDE_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/**/$(DOCUMENTATION_FOLDER)/*" \
 	-not -path "$(ROOT_DIR)/**/$(SCRIPTS_FOLDER)/*"
 
+# SVG equations exclude flags:
+FIND_SVG_EQUATIONS_EXCLUDE_FLAGS ?= $(FIND_COMMON_EXCLUDE_FLAGS)
+
 # Tests exclude flags:
 FIND_TESTS_EXCLUDE_FLAGS ?= \
 	$(FIND_COMMON_EXCLUDE_FLAGS) \
 	-not -path "$(TOOLS_DIR)/*" \
 	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(ROOT_DIR)/**/$(TESTS_FIXTURES_FOLDER)/*"
 
+# Tests directories exclude flags:
+FIND_TESTS_DIRS_EXCLUDE_FLAGS ?= \
+	$(FIND_COMMON_EXCLUDE_FLAGS) \
+	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*"
+
 # Text fixtures exclude flags:
 FIND_TESTS_FIXTURES_EXCLUDE_FLAGS ?= \
 	$(FIND_COMMON_EXCLUDE_FLAGS) \
diff --git a/tools/make/lib/ls/svg_equations.mk b/tools/make/lib/ls/svg_equations.mk
@@ -24,14 +24,7 @@ FIND_SVG_EQUATIONS_FLAGS ?= \
 	-name "$(SVG_EQUATIONS_PATTERN)" \
 	-path "$(ROOT_DIR)/**/$(DOCUMENTATION_FOLDER)/**" \
 	-regex "$(SVG_EQUATIONS_FILTER)" \
-	-not -path "$(ROOT_DIR)/.*" \
-	-not -path "$(NODE_MODULES)/*" \
-	-not -path "$(DOCS_DIR)/**/$(NODE_MODULES_FOLDER)/*" \
-	-not -path "$(BUILD_DIR)/*" \
-	-not -path "$(DIST_DIR)/*" \
-	-not -path "$(DEPS_DIR)/*" \
-	-not -path "$(REPORTS_DIR)/*" \
-	-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*"
+	$(FIND_SVG_EQUATIONS_EXCLUDE_FLAGS)
 
 ifneq ($(OS), Darwin)
 	FIND_SVG_EQUATIONS_FLAGS := -regextype posix-extended $(FIND_SVG_EQUATIONS_FLAGS)
diff --git a/tools/make/lib/ls/tests_directories.mk b/tools/make/lib/ls/tests_directories.mk
@@ -23,16 +23,7 @@ FIND_TESTS_DIRS_FLAGS ?= \
 	-type d \
 	-name "$(TESTS_FOLDER)" \
 	-regex "$(TESTS_FILTER)" \
-	-not -path "$(ROOT_DIR)/.*" \
-	-not -path "$(NODE_MODULES)/*" \
-	-not -path "$(DOCS_DIR)/**/$(NODE_MODULES_FOLDER)/*" \
-	-not -path "$(TOOLS_DIR)/*" \
-	-not -path "$(TOOLS_PKGS_DIR)/*" \
-	-not -path "$(BUILD_DIR)/*" \
-	-not -path "$(DIST_DIR)/*" \
-	-not -path "$(DEPS_DIR)/*" \
-	-not -path "$(REPORTS_DIR)/*" \
-	-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*"
+	$(FIND_TESTS_DIRS_EXCLUDE_FLAGS)
 
 ifneq ($(OS), Darwin)
 	FIND_TESTS_DIRS_FLAGS := -regextype posix-extended $(FIND_TESTS_DIRS_FLAGS)
