summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrzemysław Dolata <snowball91b@gmail.com>2018-01-10 19:30:43 (GMT)
committerGitHub <noreply@github.com>2018-01-10 19:30:43 (GMT)
commit7e970675c41f897a05fe1a944d754bd899fbff0e (patch)
tree8708d2346c52ad44dc582bb0cf3029022f418e14
parente963ef4eff86f07b67a23dfffc57f7e918959bd8 (diff)
parentfbdc1e103bf6f55c9dabe94a2530fa62e65f506b (diff)
downloadcaffe-7e970675c41f897a05fe1a944d754bd899fbff0e.zip
caffe-7e970675c41f897a05fe1a944d754bd899fbff0e.tar.gz
caffe-7e970675c41f897a05fe1a944d754bd899fbff0e.tar.bz2
Merge pull request #6048 from sclarkson/master
Fix Makefile parallel builds missing protobuf header
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c6d5685..c85c695 100644
--- a/Makefile
+++ b/Makefile
@@ -577,7 +577,7 @@ $(STATIC_NAME): $(OBJS) | $(LIB_BUILD_DIR)
@ echo AR -o $@
$(Q)ar rcs $@ $(OBJS)
-$(BUILD_DIR)/%.o: %.cpp | $(ALL_BUILD_DIRS)
+$(BUILD_DIR)/%.o: %.cpp $(PROTO_GEN_HEADER) | $(ALL_BUILD_DIRS)
@ echo CXX $<
$(Q)$(CXX) $< $(CXXFLAGS) -c -o $@ 2> $@.$(WARNS_EXT) \
|| (cat $@.$(WARNS_EXT); exit 1)