From 6baa24dcf60c2950b070e66cba4aa5e2ff42bddd Mon Sep 17 00:00:00 2001
From: Tim Warren <timothy.warren@11main.com>
Date: Wed, 6 May 2015 17:08:41 -0400
Subject: [PATCH] More Makefile improvements

---
 Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 008888b..059a632 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,6 @@ CXXFLAGS = -Os -DNDEBUG
 TEST_SRC = $(wildcard tests/*.cpp)
 TESTS = $(patsubst %.cpp,%,$(TEST_SRC))
 
-DEV = false
-
 LDLIBS =
 
 OS ?= $(shell uname -s)
@@ -47,7 +45,7 @@ endif
 
 CXX += -Iinclude -I. -I/usr/local/include
 
-ifeq ($(DEV),true)
+ifdef $(DEV)
 all: CXXFLAGS = $(DEV_CXXFLAGS)
 endif
 all: build json_wrapper $(TYRO_LIB) $(PROGRAM)
@@ -56,6 +54,7 @@ all: Tyro.app
 endif
 
 dev: DEV = true
+dev: CXXFLAGS = $(DEV_CXXFLAGS)
 dev: all
 	
 json_wrapper: json_wrapper_build
@@ -90,17 +89,18 @@ run-grind:
 	valgrind $(PROGRAM)
 
 # Make optimized and striped executable
-release: DEV = false
-release:
+release: DEV=
 ifeq ($(OS),Darwin)
-	make all
+release: all
 endif
 ifeq ($(OS),Windows_NT)
-	make exe
+release: exe
+release:
 	strip -SXx $(PROGRAM).exe
 endif
 ifeq ($(OS),Linux)
-	make all
+release: all
+release:
 	strip -SXx $(PROGRAM)
 endif
 
@@ -115,7 +115,7 @@ exe: msw_resource $(PROGRAM)
 
 # OS X application bundle	
 Tyro.app:
-ifeq ($(DEV),false)
+ifndef DEV
 	strip -SXx $(PROGRAM)
 endif
 	SetFile -t APPL $(TYRO_LIB)