From: Jeff Donahue Date: Wed, 2 Apr 2014 18:29:01 +0000 (-0700) Subject: include build/ before other dirs so old proto built files in src/ and X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b3d257eea7680c96332e6359c12eba93a784c75;p=platform%2Fupstream%2Fcaffe.git include build/ before other dirs so old proto built files in src/ and include/ don't interfere --- diff --git a/Makefile b/Makefile index b9688d7..0947196 100644 --- a/Makefile +++ b/Makefile @@ -112,8 +112,8 @@ CUDA_LIB_DIR := $(CUDA_DIR)/lib64 $(CUDA_DIR)/lib MKL_INCLUDE_DIR := $(MKL_DIR)/include MKL_LIB_DIR := $(MKL_DIR)/lib $(MKL_DIR)/lib/intel64 -INCLUDE_DIRS += ./src ./include $(CUDA_INCLUDE_DIR) INCLUDE_DIRS += $(BUILD_INCLUDE_DIR) +INCLUDE_DIRS += ./src ./include $(CUDA_INCLUDE_DIR) LIBRARY_DIRS += $(CUDA_LIB_DIR) LIBRARIES := cudart cublas curand \ pthread \