wip

1 files changed, 6 insertions, 6 deletions

diff --git a/SD-VBS/common/makefiles/Makefile.common b/SD-VBS/common/makefiles/Makefile.common
index 2080e2a..ab3a6b4 100644
--- a/SD-VBS/common/makefiles/Makefile.common
+++ b/SD-VBS/common/makefiles/Makefile.common
@@ -18,7 +18,8 @@ endif
 endif
 
 CC=gcc
-override CFLAGS += -DGCC -D$(INPUT) -pthread -I../../../../..
+LIBEXTRA ?= $(TOP_DIR)/../
+override CFLAGS += -DGCC -D$(INPUT) -pthread -I${LIBEXTRA}
 COMMON_DIR := $(TOP_DIR)/common/c
 M_COMMON := $(TOP_DIR)/common/matlab
 M_TOOLBOX=$(TOP_DIR)/common/toolbox
@@ -29,9 +30,8 @@ MTIMING_DIR := $(TOP_DIR)/cycles/$(BMARK)
 BMARK_DIR := $(TOP_DIR)/benchmarks/$(BMARK)
 TOOL_DIR := $(TOP_DIR)/tools
 LIBLITMUS ?= /playpen/mc2/liblitmus
-LIBEXTRA ?= $(TOP_DIR)/../
-ifneq ($(shell grep "define LITMUS 1" ../../../../../extra.h),)
-        override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include -I${LIBEXTRA}
+ifneq ($(shell grep "define LITMUS 1" ${TOP_DIR}/../extra.h),)
+        override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
         override LDFLAGS += -L${LIBLITMUS} -llitmus
 endif
 #The options set below and specific to each benchmark. Disparity takes 2 input images, whereas Tracking can take any >1 input images =.
@@ -61,7 +61,7 @@ COMMON_SRC := $(wildcard $(COMMON_DIR)/*.c)
 
 EXE =
 INCLUDES = -I$(COMMON_DIR) -I$(C_DIR)
-COMPILE_C = $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) -O2
+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
@@ -112,7 +112,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 -lm $(LDFLAGS) -w -o $(BMARK)$(EXE)
 
 compile-prof: $(C_SRC)
         @echo