Makefile: fix, improve, restructure

1 files changed, 6 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index dcca56a..17d3179 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
-CXX=g++ -std=c++0x -O3 -Wall -Wextra -Werror -lpthread
+CXX=g++ -std=c++0x -O3 -Wall -Wextra -Werror -Wno-strict-aliasing -lpthread -march=native
+SRC=cacount.cpp timer.hpp mmalloc.hpp
 
 all: cacount
 
-cacount :: cacount.cpp packed_array.hpp timer.hpp
+cacount: $(SRC)
 	$(CXX) -fwhole-program $< -o $@
 
-cacount_%: cacount.cpp packed_array.hpp timer.hpp
-	$(CXX) -DBIT_WIDTH=$(shell echo $@ | egrep -o '[^_]*$$') -fwhole-program $< -o $@
+cacount_%: $(SRC)
+	$(CXX) -fwhole-program $< -o $@ -DBIT_WIDTH=$(shell echo $@ | egrep -o '[^_]*$$')
 
 clean:
-	-rm cacount *~
+	-rm cacount cacount_[0-9] cacount_[0-9][0-9] *~