From 6b5d8430d2cc6337a897bd7ace1a7d57cd211c14 Mon Sep 17 00:00:00 2001
From: Patrick Simianer <p@simianer.de>
Date: Sat, 20 Sep 2014 16:27:47 +0100
Subject: meta

---
 .gitignore |  4 ++--
 Makefile   | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8bb6628..46add65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *.o
+example/*/output
 fast_weaver
-test_grammar
-test_sparse_vector
+test_*
 make_pak
 read_pak
 external/gperftools-2.1/
diff --git a/Makefile b/Makefile
index 56f89d4..34f4054 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,19 @@ CFLAGS=-std=c++11 -O3 -Wall
 TCMALLOC=$(shell pwd)/external/gperftools-2.1/lib/libtcmalloc_minimal.a -pthread
 SRC=src
 
+PRINT = @echo -e "\e[1;34mBuilding $<\e[0m"
+
 all: $(SRC)/hypergraph.o $(SRC)/fast_weaver.cc
+	$(PRINT)
 	$(COMPILER) $(CFLAGS) -lstdc++ -lm -lmsgpack $(TCMALLOC) $(SRC)/hypergraph.o \
 		$(SRC)/fast_weaver.cc \
 		-o fast_weaver
 
 $(SRC)/hypergraph.o: $(SRC)/hypergraph.cc $(SRC)/hypergraph.hh \
-												$(SRC)/semiring.hh $(SRC)/sparse_vector.hh \
-												$(SRC)/types.hh
+											$(SRC)/grammar.hh \
+											$(SRC)/semiring.hh $(SRC)/sparse_vector.hh \
+											$(SRC)/types.hh
+	$(PRINT)
 	$(COMPILER) $(CFLAGS) -g -c $(TCMALLOC) \
 		$(SRC)/hypergraph.cc \
 		-o $(SRC)/hypergraph.o
@@ -19,29 +24,40 @@ util: make_pak read_pak
 
 make_pak: $(SRC)/make_pak.cc external/json-cpp/single_include/json-cpp.hpp \
 					$(SRC)/hypergraph.hh $(SRC)/types.hh
+	$(PRINT)
 	$(COMPILER) $(CFLAGS) -lstdc++ -lm -lmsgpack -I./external \
 		$(SRC)/make_pak.cc \
 		-o make_pak
 
 read_pak: $(SRC)/read_pak.cc
+	$(PRINT)
 	$(COMPILER) $(CFLAGS) -lstdc++ -lmsgpack \
 		$(SRC)/read_pak.cc \
 		-o read_pak
 
-test: test_grammar test_parse test_sparse_vector
+test: test_grammar test_hypergraph test_parse test_sparse_vector
 
 test_grammar: $(SRC)/test_grammar.cc $(SRC)/grammar.hh
+	$(PRINT)
 	$(COMPILER) $(CFLAGS) -lstdc++ -lm $(TCMALLOC) \
 		$(SRC)/test_grammar.cc \
 		-o test_grammar
 
+test_hypergraph: $(SRC)/test_hypergraph.cc $(SRC)/hypergraph.o $(SRC)/grammar.hh
+	$(PRINT)
+	$(COMPILER) $(CFLAGS) -lstdc++ -lm $(TCMALLOC) -lmsgpack $(SRC)/hypergraph.o \
+		$(SRC)/test_hypergraph.cc \
+		-o test_hypergraph
+
 test_parse: $(SRC)/test_parse.cc $(SRC)/parse.hh \
 						$(SRC)/grammar.hh $(SRC)/util.hh
+	$(PRINT)
 	$(COMPILER) $(CFLAGS) -lstdc++ -lm $(TCMALLOC) \
 		$(SRC)/test_parse.cc \
 		-o test_parse
 
 test_sparse_vector: $(SRC)/test_sparse_vector.cc $(SRC)/sparse_vector.hh
+	$(PRINT)
 	$(COMPILER) $(CFLAGS) -lstdc++ -lm $(TCMALLOC) \
 		$(SRC)/test_sparse_vector.cc \
 		-o test_sparse_vector
-- 
cgit v1.2.3