diff options
| author | Ronghang Hu <huronghang@hotmail.com> | 2015-05-29 00:23:06 +0800 |
|---|---|---|
| committer | Ronghang Hu <huronghang@hotmail.com> | 2015-05-29 13:21:26 +0800 |
| commit | 18adbb8d1a1be91598aa23bad6550eed954e32a9 (patch) | |
| tree | 26a080d44f0140bb8420b4098f153710ec548020 /Makefile | |
| parent | 0f13feef342fc59aa113bafb45041b35ff97b649 (diff) | |
| download | caffeonacl-18adbb8d1a1be91598aa23bad6550eed954e32a9.tar.gz caffeonacl-18adbb8d1a1be91598aa23bad6550eed954e32a9.tar.bz2 caffeonacl-18adbb8d1a1be91598aa23bad6550eed954e32a9.zip | |
Fix automatic header file dependency for MatCaffe
Automatic header file dependency was introduced in #1472, but
not correctly applied to matcaffe. Fix it by moving ./caffe_.d
to build/matlab/+caffe/private/caffe_.d and add it to DEPS
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -118,7 +118,7 @@ GTEST_OBJ := $(addprefix $(BUILD_DIR)/, ${GTEST_SRC:.cpp=.o}) EXAMPLE_OBJS := $(addprefix $(BUILD_DIR)/, ${EXAMPLE_SRCS:.cpp=.o}) # Output files for automatic dependency generation DEPS := ${CXX_OBJS:.o=.d} ${CU_OBJS:.o=.d} ${TEST_CXX_OBJS:.o=.d} \ - ${TEST_CU_OBJS:.o=.d} + ${TEST_CU_OBJS:.o=.d} $(BUILD_DIR)/${MAT$(PROJECT)_SO:.$(MAT_SO_EXT)=.d} # tool, example, and test bins TOOL_BINS := ${TOOL_OBJS:.o=.bin} EXAMPLE_BINS := ${EXAMPLE_OBJS:.o=.bin} @@ -460,6 +460,9 @@ $(MAT$(PROJECT)_SO): $(MAT$(PROJECT)_SRC) $(STATIC_NAME) CXX="$(CXX)" \ CXXFLAGS="\$$CXXFLAGS $(MATLAB_CXXFLAGS)" \ CXXLIBS="\$$CXXLIBS $(STATIC_LINK_COMMAND) $(LDFLAGS)" -output $@ + @ if [ -f "$(PROJECT)_.d" ]; then \ + mv -f $(PROJECT)_.d $(BUILD_DIR)/${MAT$(PROJECT)_SO:.$(MAT_SO_EXT)=.d}; \ + fi runtest: $(TEST_ALL_BIN) $(TOOL_BUILD_DIR)/caffe |