diff options
| author | Jeff Donahue <jeff.donahue@gmail.com> | 2014-03-31 14:25:42 -0700 |
|---|---|---|
| committer | Jeff Donahue <jeff.donahue@gmail.com> | 2014-04-02 10:58:49 -0700 |
| commit | 74a3788298226e9e6552651efc3dc8a97ff29307 (patch) | |
| tree | f3418f0c09f171173cadd0231a9af7ea998a6cbd /Makefile | |
| parent | abf44a6174df4cfd69849c91cc237bb33a4e6e3e (diff) | |
| download | caffe-74a3788298226e9e6552651efc3dc8a97ff29307.tar.gz caffe-74a3788298226e9e6552651efc3dc8a97ff29307.tar.bz2 caffe-74a3788298226e9e6552651efc3dc8a97ff29307.zip | |
remove silly thing where I copied proto headers to a separate
build/include dir
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -30,7 +30,7 @@ TOOL_SRCS := $(shell find tools -name "*.cpp") # EXAMPLE_SRCS are the source files for the example binaries EXAMPLE_SRCS := $(shell find examples -name "*.cpp") # BUILD_INCLUDE_DIR contains any generated header files we want to include. -BUILD_INCLUDE_DIR := $(BUILD_DIR)/include +BUILD_INCLUDE_DIR := $(BUILD_DIR)/src # PROTO_SRCS are the protocol buffer definitions PROTO_SRC_DIR := src/$(PROJECT)/proto PROTO_SRCS := $(wildcard $(PROTO_SRC_DIR)/*.proto) @@ -316,10 +316,6 @@ $(PROTO_BUILD_DIR)/%.pb.cc $(PROTO_BUILD_DIR)/%.pb.h : \ protoc --proto_path=src --cpp_out=build/src $< @ echo -$(PROTO_BUILD_INCLUDE_DIR)/%.pb.h: $(PROTO_BUILD_DIR)/%.pb.h \ - | $(PROTO_BUILD_INCLUDE_DIR) - @ cp $(PROTO_BUILD_DIR)/$(*F).pb.h $(PROTO_BUILD_INCLUDE_DIR)/$(*F).pb.h - $(PY_PROTO_BUILD_DIR)/%_pb2.py : $(PROTO_SRC_DIR)/%.proto \ $(PY_PROTO_INIT) | $(PY_PROTO_BUILD_DIR) protoc --proto_path=src --python_out=python $< |