From 25d94aa8aabb8ac3e8bbea0bc439ea6148444cc8 Mon Sep 17 00:00:00 2001
From: leochanj <jbakita@cs.unc.edu>
Date: Wed, 21 Oct 2020 01:52:54 -0400
Subject: debug libextra and remove matlab

---
 SD-VBS/common/makefiles/Makefile.common | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'SD-VBS/common/makefiles')

diff --git a/SD-VBS/common/makefiles/Makefile.common b/SD-VBS/common/makefiles/Makefile.common
index 7fc8824..144adb2 100644
--- a/SD-VBS/common/makefiles/Makefile.common
+++ b/SD-VBS/common/makefiles/Makefile.common
@@ -18,8 +18,7 @@ endif
 endif
 
 CC=gcc
-override CFLAGS += -DGCC -D$(INPUT) -pthread -DCHECK
-
+override CFLAGS += -DGCC -D$(INPUT) -pthread -DCHECK 
 COMMON_DIR := $(TOP_DIR)/common/c
 M_COMMON := $(TOP_DIR)/common/matlab
 M_TOOLBOX=$(TOP_DIR)/common/toolbox
@@ -29,7 +28,7 @@ PRELOAD_TIMES_DIR := $(TOP_DIR)/preload-times/$(BMARK)
 MTIMING_DIR := $(TOP_DIR)/cycles/$(BMARK)
 BMARK_DIR := $(TOP_DIR)/benchmarks/$(BMARK)
 TOOL_DIR := $(TOP_DIR)/tools
-
+LIBLITMUS := /home/litmus/liblitmus
 #The options set below and specific to each benchmark. Disparity takes 2 input images, whereas Tracking can take any >1 input images =.
 
 # Variables exported from the benchmark specific Makefiles:
@@ -56,8 +55,8 @@ COMMON_SRC := $(wildcard $(COMMON_DIR)/*.c)
 # RULES
 
 EXE =
-INCLUDES = -I$(COMMON_DIR) -I$(C_DIR)
-COMPILE_C = $(CC) $(CFLAGS) -lm -O2 $(INCLUDES)
+INCLUDES = -I$(COMMON_DIR) -I$(C_DIR) -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
+COMPILE_C = $(CC) $(CFLAGS) $(INCLUDES) -O2
 #COMPILE_C = $(CC) $(CFLAGS) -DGENERATE_OUTPUT -lm -O2 $(INCLUDES)
 COMPILE_G = $(CC) $(CFLAGS) -g -lm $(INCLUDES)
 COMPILE_PG = $(COMPILE_G) -pg
@@ -108,7 +107,7 @@ compile-preload:
 compile: $(C_SRC)
 	@echo 
 	@echo -e "Benchmark\t\t- $(BMARK)"
-	@$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -lm -w -o $(BMARK)$(EXE)
+	@$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -L$(LIBLITMUS) -llitmus -lm  -w -o $(BMARK)$(EXE)
 
 compile-prof: $(C_SRC)
 	@echo 
-- 
cgit v1.2.2