Update module install recipes

kgryte · kgryte · commit 374d3f48fccf · 2017-09-23T01:32:49.000-07:00
diff --git a/tools/make/lib/node/Makefile b/tools/make/lib/node/Makefile
@@ -1,34 +1,25 @@
 
-# VARIABLES #
-
-# Define the path to the root `package.json`:
-ROOT_PACKAGE_JSON ?= $(ROOT_DIR)/package.json
-
-
 # DEPENDENCIES #
 
 include $(TOOLS_MAKE_LIB_DIR)/node/addons.mk
+include $(TOOLS_MAKE_LIB_DIR)/node/modules.mk
 
 
 # TARGETS #
 
-# Install node module dependencies.
-#
-# This target installs package dependencies by executing [`npm install`][1]. Packages will be installed in a local `node_modules` directory relative to the project's `package.json` file.
+# Run Node install sequence.
 #
-# [1]: https://docs.npmjs.com/cli/install
+# This target runs the Node install sequence, including installing node module dependencies and compiling native add-ons.
 
-install-node: $(ROOT_PACKAGE_JSON)
-	$(QUIET) $(NPM) install
+install-node: install-node-modules install-node-addons
 
 .PHONY: install-node
 
 
-# Remove node module dependencies.
+# Perform Node clean-up.
 #
-# This target cleans the `node_modules` directory by removing it entirely.
+# This target runs cleanup tasks specific to Node.js, such as removing node module dependencies and removing native add-ons.
 
-clean-node:
-	$(QUIET) $(DELETE) $(DELETE_FLAGS) $(NODE_MODULES)
+clean-node: clean-node-addons clean-node-modules
 
 .PHONY: clean-node
diff --git a/tools/make/lib/node/addons.mk b/tools/make/lib/node/addons.mk
@@ -28,7 +28,7 @@ endif
 #
 # This target installs native add-ons. If unable to install a native add-on, the target prints an error message and proceeds to try installing the next add-on.
 
-install-node-addons: clean-node-addons
+install-node-addons: $(NODE_MODULES) clean-node-addons
 	$(QUIET) $(MAKE) -f $(this_file) list-pkgs-addons | while read -r pkg; do \
 		if echo "$$pkg" | grep -v '^\/.*\|^[a-zA-Z]:.*' >/dev/null; then \
 			continue; \
diff --git a/tools/make/lib/node/modules.mk b/tools/make/lib/node/modules.mk
@@ -0,0 +1,29 @@
+
+# VARIABLES #
+
+# Define the path to the root `package.json`:
+ROOT_PACKAGE_JSON ?= $(ROOT_DIR)/package.json
+
+
+# TARGETS #
+
+# Install node module dependencies.
+#
+# This target installs package dependencies by executing [`npm install`][1]. Packages will be installed in a local `node_modules` directory relative to the project's `package.json` file.
+#
+# [1]: https://docs.npmjs.com/cli/install
+
+install-node-modules: $(ROOT_PACKAGE_JSON)
+	$(QUIET) $(NPM) install
+
+.PHONY: install-node-modules
+
+
+# Remove node module dependencies.
+#
+# This target cleans the `node_modules` directory by removing it entirely.
+
+clean-node-modules:
+	$(QUIET) $(DELETE) $(DELETE_FLAGS) $(NODE_MODULES)
+
+.PHONY: clean-node-modules
diff --git a/tools/make/usage.txt b/tools/make/usage.txt
@@ -48,10 +48,12 @@ Usage: make <cmd>
   make check-licenses         Check package dependency licenses.
   make install                Run install sequence.
   make install-node           Run Node install sequence.
+  make install-node-modules   Install Node dependencies.
   make install-node-addons    Install Node add-ons.
   make install-deps           Install vendor dependencies.
   make clean                  Run all cleanup tasks.
-  make clean-node             Remove Node dependencies.
+  make clean-node             Run Node cleanup tasks.
+  make clean-node-modules     Remove Node dependencies.
   make clean-node-addons      Remove Node add-ons.
   make clean-deps             Remove vendor dependencies.
   make inspect.VARIABLE       Print the runtime value of a VARIABLE.

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ endif`
`28`	`28`	`#`
`29`	`29`	`# This target installs native add-ons. If unable to install a native add-on, the target prints an error message and proceeds to try installing the next add-on.`
`30`	`30`
`31`		`-install-node-addons: clean-node-addons`
	`31`	`+install-node-addons: $(NODE_MODULES) clean-node-addons`
`32`	`32`	`$(QUIET) $(MAKE) -f $(this_file) list-pkgs-addons \| while read -r pkg; do \`
`33`	`33`	`if echo "$$pkg" \| grep -v '^\/.\\|^[a-zA-Z]:.' >/dev/null; then \`
`34`	`34`	`continue; \`