diff Makefile.inc @ 141:d6f22887283e adaptive_diagonals

Merge from branch refactors

--- a/Makefile.inc	Fri Dec 05 18:06:51 2014 +0000
+++ b/Makefile.inc	Fri Jan 09 17:20:52 2015 +0000
@@ -4,28 +4,41 @@
 CXX		?= g++
 CC		?= gcc
 
+CXXFLAGS	:= -Isrc $(CXXFLAGS)
+
+TEST_LDFLAGS	+= -lboost_unit_test_framework
+
 HEADERS		:= $(wildcard src/*.h)
 SOURCES		:= $(wildcard src/*.cpp)
+OBJECTS		:= $(SOURCES:.cpp=.o)
 
-OBJECTS		:= $(SOURCES:.cpp=.o)
+TEST_SOURCES	:= $(wildcard test/*.cpp)
+TEST_OBJECTS	:= $(TEST_SOURCES:.cpp=.o)
+TESTS		:= $(TEST_OBJECTS:.o=)
+
+all:		$(PLUGIN) $(TESTS)
+		for t in $(TESTS); do echo "Running $$t"; ./"$$t" || exit 1; done
 
 $(PLUGIN):	$(OBJECTS)
 		$(CXX) -o $@ $^ $(LDFLAGS) $(PLUGIN_LDFLAGS)
 
+test/%:	test/%.o $(OBJECTS)
+		$(CXX) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
+
 clean:		
-		rm -f $(OBJECTS)
+		rm -f $(OBJECTS) $(TEST_OBJECTS) $(TESTS)
 
 distclean:	clean
 		rm -f $(PLUGIN)
 
 depend:
-	makedepend -Y -fMakefile.inc $(SOURCES) $(HEADERS)
+	makedepend -Y -fMakefile.inc $(SOURCES) $(HEADERS) $(TEST_SOURCES)
 	
 # DO NOT DELETE
 
 src/DistanceMetric.o: src/DistanceMetric.h
+src/Path.o: src/Path.h
 src/FeatureConditioner.o: src/FeatureConditioner.h
-src/Path.o: src/Path.h
 src/MatchFeatureFeeder.o: src/MatchFeatureFeeder.h src/Matcher.h
 src/MatchFeatureFeeder.o: src/DistanceMetric.h src/Finder.h
 src/FeatureExtractor.o: src/FeatureExtractor.h
@@ -48,3 +61,6 @@
 src/MatchVampPlugin.o: src/MatchPipeline.h src/Matcher.h src/DistanceMetric.h
 src/MatchVampPlugin.o: src/Finder.h src/FeatureExtractor.h
 src/MatchVampPlugin.o: src/FeatureConditioner.h src/MatchFeatureFeeder.h
+test/TestFeatureConditioner.o: src/FeatureConditioner.h
+test/TestDistanceMetric.o: src/DistanceMetric.h
+test/TestFeatureExtractor.o: src/FeatureExtractor.h