--- a/c/Makefile	Fri Dec 16 11:34:07 2011 -0500
+++ b/c/Makefile	Tue Dec 20 00:31:37 2011 -0500
@@ -51,11 +51,11 @@
 
 #GUI_OBJS = 
 CV_OBJS = cvutils.o
-COMMON_OBJS = utils.o
+COMMON_OBJS = utils.o Motion.o Parameters.o utils.o
 OBJS = $(COMMON_OBJS) $(CV_OBJS)
-TESTS_OBJS = test_feature.o
+TESTS_OBJS = test_feature.o test_graph.o
 ifeq ($(UNAME), Linux)
-	TESTS_OBJS += $(LINUX_BOOST_PREFIX)/lib/libboost_unit_test_framework-mt.a
+	TESTS_OBJS += $(LINUX_BOOST_PREFIX)/lib/libboost_unit_test_framework.a
 endif
 
 
@@ -75,7 +75,7 @@
 	$(CXX) $(CFLAGS) $(LIBS) -o $(EXE_DIR)/$@ $^ $(LDFLAGS)
 	$(EXE_DIR)/$@
 
-feature-based-tracking: feature-based-tracking.o cvutils.o Motion.o Parameters.o utils.o
+feature-based-tracking: feature-based-tracking.o $(OBJS)
 	$(CXX) $(CFLAGS) $(LIBS) $^ -o $(EXE_DIR)/$@ $(LDFLAGS)
 
 track-features.o: track-features.cpp