moved the makefile

I3ck · Jan 25, 2015 · f97a30d · f97a30d
1 parent f404496
commit f97a30d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,5 @@
 *.cbp
 *.test
 *.swp
-tests/bin/
-tests/obj/
+bin/
+obj/
diff --git a/tests/Makefile → Makefile b/tests/Makefile → Makefile
@@ -2,7 +2,7 @@ CC = g++
 DEBUG ?= 0
 CFLAGS = -std=c++11
 
-.PHONY: all, run_tests
+.PHONY: tests, run_tests
 
 ifeq ($(DEBUG), 1)
   	CFLAGS += -DDEBUG
@@ -13,12 +13,13 @@ else
 endif
 
 
-all: make_tests run_tests
+tests: make_tests run_tests
 
 make_tests:
-	$(CC) $(CFLAGS) -D USE_DOUBLE test_lib_2d.cpp -o $(TARGET)_DOUBLE
-	$(CC) $(CFLAGS) -D USE_LDOUBLE test_lib_2d.cpp -o $(TARGET)_LDOUBLE
-	$(CC) $(CFLAGS) -D USE_FLOAT test_lib_2d.cpp -o $(TARGET)_FLOAT
+	mkdir -p bin/
+	$(CC) $(CFLAGS) -D USE_DOUBLE tests/test_lib_2d.cpp -o $(TARGET)_DOUBLE
+	$(CC) $(CFLAGS) -D USE_LDOUBLE tests/test_lib_2d.cpp -o $(TARGET)_LDOUBLE
+	$(CC) $(CFLAGS) -D USE_FLOAT tests/test_lib_2d.cpp -o $(TARGET)_FLOAT
 
 run_tests:
 	./$(TARGET)_DOUBLE

diff --git a/README.md b/README.md
@@ -78,9 +78,7 @@ add `inc/` to your include path and `#include lib_2d.h` within your code
 
 
 ##testing
-to make and run the tests  
-`cd tests/`  
-`make`  
+`make tests`  
 you can also use  
 `make clean`
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,5 @@ @@
     *.cbp
     *.test
     *.swp
-    tests/bin/
-    tests/obj/
+    bin/
+    obj/