From 34f34d919fefcfb887eef56504f973e9d85a3942 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Fri, 24 Aug 2018 16:04:46 -0400
Subject: [PATCH] rename targets to avoid conflict

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f9000c63..7c03a6d8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: clean images image% launch notebook% package dist run test test% shell shell% dist-run dist-run%
+.PHONY: clean all-images image% launch notebook% package dist run test all-tests test% shell shell% dist-run dist-run%
 
 NB_UID=$(shell id -u)
 NB_GID=$(shell id -g)
@@ -8,7 +8,7 @@ IMAGE=rstudio/rsconnect-jupyter-py
 clean:
 	rm -rf build/ dist/ rsconnect.egg-info/
 
-images: image2 image3.5 image3.6 image3.7
+all-images: image2 image3.5 image3.6 image3.7
 
 image%:
 	docker build \
@@ -35,7 +35,7 @@ launch:
 notebook%:
 	make DOCKER_IMAGE=$(IMAGE)$* PY_VERSION=$* TARGET=run launch
 
-tests: test2 test3.5 test3.6 test3.7
+all-tests: test2 test3.5 test3.6 test3.7
 
 test:
 # TODO run in container