1 files changed, 18 insertions, 14 deletions
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index 4e64c0cb..2e42d956 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -1,5 +1,5 @@
 
-include ../Makefile.config
+include ../Makefile.config.acl
 
 CXX_SRCS+=test_pooling_layer.cpp
 CXX_SRCS+=test_softmax_layer.cpp
@@ -11,33 +11,42 @@ CXX_SRCS+= test_convolution_layer.cpp
 #CXX_SRCS= test_fail.cpp
 BIN_SRCS=test_caffe_main.cpp test.cpp
 
-HOME=/home/firefly
+HOME=$(AIDDIR)
 #
 #  caffe related stuff
 #
 
 CAFFE_ROOT=$(HOME)/CaffeOnACL
-CAFFE_INCS = -I$(CAFFE_ROOT)/include -I$(CAFFE_ROOT)/distribute/include/
-CAFFE_LIBS = -L$(CAFFE_ROOT)/distribute/lib -lcaffe  -lglog -lgflags -lprotobuf -lboost_system -lboost_filesystem
-CAFFE_RPATH =$(CAFFE_ROOT)/distribute/lib
+
+CAFFE_INCS = -I$(CAFFE_ROOT)/include -I$(CAFFE_ROOT)/include/
+CAFFE_LIBS = -L$(CAFFE_ROOT)/lib -lcaffe  -lglog -lgflags -lprotobuf -lboost_system -lboost_filesystem
+
+
+CAFFE_RPATH =$(CAFFE_ROOT)/lib
+
+#
+# opncv3.3.0 related sutff
+#
+
+OPENCV_ROOT=$(HOME)/opencv3.3.0
+OPENCV_RPATH =$(OPENCV_ROOT)/lib
 
 
 #
 # google test related stuff
 #
 
-GTEST_ROOT=/usr/local
+GTEST_ROOT=$(HOME)/googletest
 GTEST_LIBS=$(GTEST_ROOT)/lib/libgtest_main.a $(GTEST_ROOT)/lib/libgtest.a
 GTEST_INCS=-I$(GTEST_ROOT)/include/
 
-
 #
 # arm compute
 #
 
 ACL_ROOT=$(HOME)/ComputeLibrary
-ACL_LIBS=-L$(ACL_ROOT)/build -L$(ACL_ROOT)/build/arm_compute -larm_compute  -lOpenCL
-ACL_RPATH=$(ACL_ROOT)/build:$(ACL_ROOT)/build/arm_compute
+ACL_LIBS=-L$(ACL_ROOT)/lib -L$(ACL_ROOT)/arm_compute -larm_compute  -lOpenCL
+ACL_RPATH=$(ACL_ROOT)/lib:$(ACL_ROOT)/arm_compute
 
 COMM_CFLAGS=$(GTEST_INCS) $(CAFFE_INCS) -Wall -g  -DCPU_ONLY -DUSE_ACL 
 #USE_PROFILING -- get profiling informations, is controled by LOGACL
@@ -58,11 +67,6 @@ BIN_EXES=$(BIN_OBJS:.o=)
 
 LIBS+=$(CAFFE_LIBS) $(GTEST_LIBS) -lpthread -lopenblas $(ACL_LIBS)
 
-RT_PATH=-Wl,-rpath,$(CAFFE_RPATH):$(ACL_RPATH)
-
-LDFLAGS+=$(RT_PATH)
-
-
 all : $(BIN_EXES)
 
 $(BIN_EXES):%:%.o