Add cwrapper_test to make test target

Author: Henry Qin

Makefile

@@ -34,15 +34,6 @@ $(OBJECT_DIR)/libPerfUtils.a: $(OBJECTS)
 $(OBJECT_DIR)/TimeTraceTest: $(OBJECT_DIR)/TimeTraceTest.o $(OBJECT_DIR)/libPerfUtils.a
 	$(CXX) $(CXXFLAGS) -o $@ $^
 
-$(OBJECT_DIR)/timetrace_wrapper_test: $(OBJECT_DIR)/timetrace_wrapper_test.o $(OBJECT_DIR)/libPerfUtils.a
-	$(CC) $(CFLAGS) -lstdc++ -o $@ $^
-
-$(OBJECT_DIR)/cycles_wrapper_test: $(OBJECT_DIR)/cycles_wrapper_test.o $(OBJECT_DIR)/libPerfUtils.a
-	$(CC) $(CFLAGS) -lstdc++ -o $@ $^
-
-$(OBJECT_DIR)/perf_wrapper_test: $(OBJECT_DIR)/perf_wrapper_test.o $(OBJECT_DIR)/libPerfUtils.a
-	$(CC) $(CFLAGS) -lstdc++ -o $@ $^ -lm
-
 -include $(DEP)
 
 $(OBJECT_DIR)/%.d: $(WRAPPER_DIR)/%.c | $(OBJECT_DIR)
@@ -76,10 +67,14 @@ GMOCK_DIR=../googletest/googlemock
 TEST_LIBS=-Lobj/ -lPerfUtils $(OBJECT_DIR)/libgtest.a  $(OBJECT_DIR)/libgmock.a
 INCLUDE+=-I${GTEST_DIR}/include -I${GMOCK_DIR}/include
 
-test: $(OBJECT_DIR)/UtilTest $(OBJECT_DIR)/PerfTest $(OBJECT_DIR)/StatsTest
+test: $(OBJECT_DIR)/UtilTest $(OBJECT_DIR)/PerfTest $(OBJECT_DIR)/StatsTest \
+	  $(OBJECT_DIR)/cycles_wrapper_test  $(OBJECT_DIR)/perf_wrapper_test  $(OBJECT_DIR)/timetrace_wrapper_test
 	$(OBJECT_DIR)/UtilTest
 	$(OBJECT_DIR)/PerfTest
 	$(OBJECT_DIR)/StatsTest
+	$(OBJECT_DIR)/cycles_wrapper_test
+	$(OBJECT_DIR)/perf_wrapper_test
+	$(OBJECT_DIR)/timetrace_wrapper_test
 
 $(OBJECT_DIR)/UtilTest: $(OBJECT_DIR)/UtilTest.o $(OBJECT_DIR)/libgtest.a  $(OBJECT_DIR)/libgmock.a \
 						$(OBJECT_DIR)/libPerfUtils.a
@@ -106,6 +101,16 @@ $(OBJECT_DIR)/libgmock.a:
         -o $(OBJECT_DIR)/gmock-all.o
 	ar -rv $(OBJECT_DIR)/libgmock.a $(OBJECT_DIR)/gmock-all.o
 
+$(OBJECT_DIR)/timetrace_wrapper_test: $(OBJECT_DIR)/timetrace_wrapper_test.o $(OBJECT_DIR)/libPerfUtils.a
+	$(CC) $(CFLAGS) -lstdc++ -o $@ $^
+
+$(OBJECT_DIR)/cycles_wrapper_test: $(OBJECT_DIR)/cycles_wrapper_test.o $(OBJECT_DIR)/libPerfUtils.a
+	$(CC) $(CFLAGS) -lstdc++ -o $@ $^
+
+$(OBJECT_DIR)/perf_wrapper_test: $(OBJECT_DIR)/perf_wrapper_test.o $(OBJECT_DIR)/libPerfUtils.a
+	$(CC) $(CFLAGS) -lstdc++ -o $@ $^ -lm
+
+
 ################################################################################
 clean:
 	rm -rf $(LIB_DIR) $(INCLUDE_DIR) $(OBJECT_DIR)