diff --git a/makefiles/lint/robot.mk b/makefiles/lint/robot.mk
index fa8175c..6c67ad3 100644
--- a/makefiles/lint/robot.mk
+++ b/makefiles/lint/robot.mk
@@ -15,15 +15,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------
 
-$(if $(DEBUG),$(warning ENTER))
-
-##-------------------##
-##---]  GLOBALS  [---##
-##-------------------##
-.PHONY: lint-robot lint-robot-all lint-robot-modified
-
-have-robot-files := $(if $(ROBOT_FILES),true)
-ROBOT_FILES      ?= $(error ROBOT_FILES= required)
+ROBOT_FILES ?= $(error ROBOT_FILES= is required)
 
 LINT_ARGS ?= --verbose --configure LineTooLong:130 -e LineTooLong \
              --configure TooManyTestSteps:65 -e TooManyTestSteps \
@@ -33,62 +25,19 @@
              --configure FileTooLong:2000 -e FileTooLong \
              -e TrailingWhitespace
 
-## -----------------------------------------------------------------------
-## Intent: Use the robot command to perform syntax checking.
-##   % make lint
-##   % make lint-robot-all
-##   % make lint-robot-modified
-## -----------------------------------------------------------------------
+
+.PHONY: lint-robot
+
 ifndef NO-LINT-ROBOT
-  lint-robot-mode := $(if $(have-robot-files),modified,all)
-  lint : lint-robot-$(lint-robot-mode)
-endif# NO-LINT-ROBOT
+  lint : lint-robot
+endif
 
-## -----------------------------------------------------------------------
-## Intent: exhaustive robot syntax checking
-## -----------------------------------------------------------------------
-lint-robot-all:
-	$(HIDE)$(MAKE) --no-print-directory rflint-install
+lint-robot: vst_venv
+	source ./$</bin/activate \
+	    ; set -u \
+	    ; rflint $(LINT_ARGS) $(ROBOT_FILES)
 
-	$(activate)\
- && find . \( -iname '*.robot' \) -print0 \
-	| $(xargs-n1) rflint $(LINT_ARGS)
-
-## -----------------------------------------------------------------------
-## Intent: check deps for format and python3 cleanliness
-## Note:
-##   robot --py3k option no longer supported
-## -----------------------------------------------------------------------
-lint-robot-modified: $(venv-activate-script)
-	$(HIDE)$(MAKE) --no-print-directory rflint-install
-
-	$(activate) && rflint $(LINT_ARGS) $(ROBOT_FILES)
-
-## -----------------------------------------------------------------------
-## Intent: Install the rflint command for syntax checking.
-##   Note: requirements.txt pip install not used here ATM due to implicit
-##         per-repository dependency config to enable checking.
-## -----------------------------------------------------------------------
-rflint-install: $(venv-activate-script)
-	@echo
-	@echo "** -----------------------------------------------------------------------"
-	@echo "** robot syntax checking"
-	@echo "** -----------------------------------------------------------------------"
-	$(activate)\
- && pip install --upgrade robotframework-lint
-	$(activate) && rflint --version
-	@echo
-
-## -----------------------------------------------------------------------
-## Intent: Display command usage
-## -----------------------------------------------------------------------
 help::
-	@echo '  lint-robot          Syntax check python using the robot command'
-  ifdef VERBOSE
-	@echo '  lint-robot-all       robot checking: exhaustive'
-	@echo '  lint-robot-modified  robot checking: only modified'
-  endif
-
-$(if $(DEBUG),$(warning LEAVE))
+	@echo "  lint-robot           Syntax check robot sources using rflint"
 
 # [EOF]