WIP: v1 recursive

homework_1/Makefile

@@ -23,11 +23,11 @@ PROJECT         := PDS_homework_1
 # Excecutable's name
 TARGET          := knnsearch
 # Source directories list(space seperated). Makefile-relative path, UNDER current directory.
-SRC_DIR_LIST    := src
+SRC_DIR_LIST    := src gtest
 # Include directories list(space seperated). Makefile-relative path.
 INC_DIR_LIST    := inc \
                    src \
-                   Libs/matrix/include/ \
+                   gtest \
                    /usr/include/hdf5/serial/
 #                   Libs/MATLAB/R2019b/include/ \
 
@@ -56,7 +56,6 @@ PRE_DEFS		:=
 LDFLAGS         := -pthread -lopenblas \
                    -L/usr/lib/x86_64-linux-gnu/hdf5/serial -lhdf5
 #                   -LLibs/MATLAB/R2019b/bin/ -lmat -lmx -Wl,-rpath,Libs/MATLAB/R2019b/bin/ \
-#                   -Wl,-rpath,Libs/unwind/bin/
 
 # Map output file
 MAP_FILE        := output.map
@@ -198,8 +197,8 @@ local_v0_opt: TARGET := local_v0_opt
 local_v0_opt: $(BUILD_DIR)/$(TARGET)
 	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
 	
-local_v1: CFLAGS := $(DEB_CFLAGS) -DCODE_VERSION=4
-local_v1: CXXFLAGS := $(DEB_CXXFLAGS) -DCODE_VERSION=4
+local_v1: CFLAGS := $(DEB_CFLAGS) -DCODE_VERSION=1
+local_v1: CXXFLAGS := $(DEB_CXXFLAGS) -DCODE_VERSION=1
 local_v1: TARGET := local_v1
 local_v1: $(BUILD_DIR)/$(TARGET)
 	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
@@ -235,7 +234,13 @@ v1: TARGET := knnsearch_v1
 v1: $(BUILD_DIR)/$(TARGET)
 	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
 
-
+tests: CFLAGS := $(DEB_CFLAGS) -DCODE_VERSION=0 -DTESTING
+tests: CXXFLAGS := $(DEB_CXXFLAGS) -DCODE_VERSION=0 -DTESTING
+tests: TARGET := tests
+tests: $(BUILD_DIR)/$(TARGET)
+	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
+	
+	
 #
 # ========= Inside CSAL Image build rules ===========
 #
@@ -280,6 +285,6 @@ csal_v1: $(BUILD_DIR)/$(TARGET)
 # make IMAGE=hpcimage EXEC=knnsearch_v1 run
 # make IMAGE=hpcimage EXEC=knnsearch_v1 run
 #
-run: DOCKER := $(DOCKER_CMD)
+
 run:
 	$(DOCKER) ./out/$(EXEC)