From 57b46309627adbd3f949c3ec115ed29d469d4678 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <xena@yolo-swag.com>
Date: Sat, 13 Jun 2015 12:03:48 -0700
Subject: [PATCH] Make output pretty, standardize gcc calls

---
 Tuprules.tup   | 10 ++++++++--
 src/.gitignore |  1 +
 src/Tupfile    |  4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Tuprules.tup b/Tuprules.tup
index 3d020b7..a710148 100644
--- a/Tuprules.tup
+++ b/Tuprules.tup
@@ -6,6 +6,12 @@ NIMFLAGS += -d:threads
 NIMFLAGS += --verbosity:0
 
 GOFLAGS += -g
+GOFLAGS += -O3
 
-!nim = |> nim c $(NIMFLAGS) -o:%o %f && rm -rf .nimcache |>
-!gccgo = |> gccgo $(GOFLAGS) -o %o %f |>
+CFLAGS += -Wall
+CFLAGS += -Werror
+
+!nim = |> ^ Nim: %f -> Binary %o^ nim c $(NIMFLAGS) -o:%o %f && rm -rf .nimcache |>
+!gccgo = |> ^ GCCGo: %f -> Binary %o^ gccgo $(GOFLAGS) -o %o %f |>
+!cc = |> ^ CC: %f -> Binary %o^ gcc $(CFLAGS) -o %o %f |>
+!obj = |> ^ CC: %f -> Binary %o^ gcc $(CFLAGS) -c -o %o %f |>
diff --git a/src/.gitignore b/src/.gitignore
index a48472b..220954d 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,4 +1,5 @@
 ##### TUP GITIGNORE #####
 ##### Lines below automatically generated by Tup.
 ##### Do not edit.
+/.gitignore
 /reaper.o
diff --git a/src/Tupfile b/src/Tupfile
index 786ca07..0cba356 100644
--- a/src/Tupfile
+++ b/src/Tupfile
@@ -5,5 +5,5 @@ include_rules
 : foreach *.nim |> !nim |> ../bin/%B
 : foreach *.go |> !gccgo |> ../bin/%B
 
-: foreach *.c |> gcc -Wall -c %f -o %o |> %B.o
-: reaper.o |> gcc %f -o %o |> ../bin/reaper
+: foreach *.c |> !obj |> %B.o
+: reaper.o |> !cc |> ../bin/reaper