diff options
| author | Jeff Donahue <jeff.donahue@gmail.com> | 2014-03-30 04:42:43 -0700 |
|---|---|---|
| committer | Jeff Donahue <jeff.donahue@gmail.com> | 2014-04-02 10:58:49 -0700 |
| commit | 9f14265cfd05762a404bd033a73df4f125bd0194 (patch) | |
| tree | dc7fe8b84d7b1c725fc8f18b6c5d7e84d35d25cc /Makefile | |
| parent | 195ba81b8836846da69b9ec192dec457ba82f959 (diff) | |
| download | caffe-9f14265cfd05762a404bd033a73df4f125bd0194.tar.gz caffe-9f14265cfd05762a404bd033a73df4f125bd0194.tar.bz2 caffe-9f14265cfd05762a404bd033a73df4f125bd0194.zip | |
libcaffe.* in build/lib/
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -8,8 +8,9 @@ include Makefile.config ############################################################################## # The target static library and shared library name -NAME := lib$(PROJECT).so -STATIC_NAME := lib$(PROJECT).a +LIB_BUILD_DIR := $(BUILD_DIR)/lib +NAME := $(LIB_BUILD_DIR)/lib$(PROJECT).so +STATIC_NAME := $(LIB_BUILD_DIR)/lib$(PROJECT).a ############################## # Get all source files @@ -133,7 +134,7 @@ ifneq ($(strip $(DISTRIBUTE_DIR)),distribute) DIST_ALIASES += distribute endif -ALL_BUILD_DIRS := $(BUILD_DIR) $(OBJ_BUILD_DIR) \ +ALL_BUILD_DIRS := $(BUILD_DIR) $(LIB_BUILD_DIR) $(OBJ_BUILD_DIR) \ $(LAYER_BUILD_DIR) $(UTIL_BUILD_DIR) $(TOOL_BUILD_DIRS) \ $(TEST_BUILD_DIR) $(TEST_LINK_DIR) $(GTEST_BUILD_DIR) \ $(EXAMPLE_BUILD_DIRS) \ @@ -232,11 +233,11 @@ runtest: $(TEST_ALL_BIN) $(ALL_BUILD_DIRS): @ mkdir -p $@ -$(NAME): $(PROTO_OBJS) $(OBJS) +$(NAME): $(PROTO_OBJS) $(OBJS) | $(LIB_BUILD_DIR) $(CXX) -shared -o $(NAME) $(OBJS) $(CXXFLAGS) $(LDFLAGS) $(WARNINGS) @ echo -$(STATIC_NAME): $(PROTO_OBJS) $(OBJS) +$(STATIC_NAME): $(PROTO_OBJS) $(OBJS) | $(LIB_BUILD_DIR) ar rcs $(STATIC_NAME) $(PROTO_OBJS) $(OBJS) @ echo |