Update Makefile to tmuxp's latest

Author: tony

Makefile

@@ -1,8 +1,20 @@
+WATCH_FILES= find . -type f -not -path '*/\.*' | grep -i '.*[.]py$$' 2> /dev/null
+
+
 test:
-	py.test
+	py.test $(test)
+
+entr_warn:
+	@echo "----------------------------------------------------------"
+	@echo "     ! File watching functionality non-operational !      "
+	@echo ""
+	@echo "Install entr(1) to automatically run tasks on file change."
+	@echo "See http://entrproject.org/"
+	@echo "----------------------------------------------------------"
+
 
 watch_test:
-	if command -v entr > /dev/null; then find . -type f -not -path '*/\.*' | grep -i '.*[.]py' | entr -c make test; else make test; echo "\nInstall entr(1) to automatically run tests on file change.\n See http://entrproject.org/"; fi
+	if command -v entr > /dev/null; then ${WATCH_FILES} | entr -c $(MAKE) test; else $(MAKE) test entr_warn; fi
 
 build_docs:
 	cd doc && $(MAKE) html
@@ -14,6 +26,4 @@ flake8:
 	flake8 libtmux tests
 
 watch_flake8:
-	if command -v entr > /dev/null; then find . -type f -not -path '*/\.*' | grep -i '.*[.][py]' | entr -c make flake8; else make flake8; echo "\nInstall entr(1) to automatically run tests on file change.\n See http://entrproject.org/"; fi
-
-.PHONY: flake8
+	if command -v entr > /dev/null; then ${WATCH_FILES} | entr -c $(MAKE) flake8; else $(MAKE) flake8 entr_warn; fi

doc/Makefile

@@ -156,8 +156,10 @@ checkbuild:
 	rm -rf $(BUILDDIR)
 	$(SPHINXBUILD) -n -q ./ $(BUILDDIR)
 
+WATCH_FILES= find .. -type f -not -path '*/\.*' | grep -i '.*[.]rst$$\|CHANGES\|TODO\|.*conf\.py$$' 2> /dev/null
+
 watch:
-	if command -v entr > /dev/null; then find .. -type f -not -path '*/\.*' | grep -i '.*[.]rst\|CHANGES\|TODO\|conf.py' | entr -c make html; else make html; echo "\nInstall entr(1) to automatically run tests on file change.\n See http://entrproject.org/"; fi
+	if command -v entr > /dev/null; then ${WATCH_FILES} | entr -c $(MAKE) html; else $(MAKE) html; fi
 
 serve:
-	echo 'docs built to <http://0.0.0.0:8023/_build/html>'; python -m SimpleHTTPServer 8023
+	echo 'docs built to <http://0.0.0.0:8023/_build/html>'; python -m SimpleHTTPServer 8003