From 19d86132a88f19a8578b6a640a8eefa3e856fdfb Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 4 Mar 2017 13:12:29 +0100
Subject: Makefile: Separate refactor and reformat targets.

Removed tools/refactor.sh.
---
 Makefile          | 7 +++++--
 tools/refactor.sh | 8 --------
 2 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100755 tools/refactor.sh

diff --git a/Makefile b/Makefile
index 343fd8f4f..be3911d77 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,10 @@ bench:
 	stack bench
 
 refactor:
-	./tools/refactor.sh $(sourcefiles)
+	for f in $(sourcefiles); do echo $$f; hlint --refactor --refactor-options='-i' --cpp-file=`stack path --dist-dir`/build/autogen/cabal_macros.h $$f >/dev/null ; perl -i'' -ne 'if (/./) { print "\n" x $$n, $$_; $$n = 0 } else { $$n++ }' $$f; done
+
+reformat:
+	for f in $(sourcefiles); do echo $$f; stylish-haskell -i $$f ; done
 
 changes_github:
 	pandoc --filter extract-changes.hs changelog -t markdown_github | sed -e 's/\\#/#/g' | pbcopy
@@ -57,4 +60,4 @@ download_stats:
 clean:
 	stack clean
 
-.PHONY: deps quick full install clean test bench changes_github macospkg dist prof download_stats refactor
+.PHONY: deps quick full install clean test bench changes_github macospkg dist prof download_stats refactor reformat
diff --git a/tools/refactor.sh b/tools/refactor.sh
deleted file mode 100755
index 40e3c964e..000000000
--- a/tools/refactor.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-cppdir=`stack path --dist-dir`/build/autogen
-for f in $*
-do
-    echo "Applying hlint --refactor to $f"
-    hlint --refactor -i --cpp-file=$cppdir/cabal_macros.h $f >/dev/null
-    echo "Applying stylish-haskell to $f"
-    stylish-haskell -i $f | perl -ne 'if (/./) { print "\n" x $n, $_; $n = 0 } else { $n++ }' >/dev/null
-done
-- 
cgit v1.2.3