diff options
| author | Jonathan L Long <jonlong@cs.berkeley.edu> | 2015-02-17 01:19:51 -0800 |
|---|---|---|
| committer | Jonathan L Long <jonlong@cs.berkeley.edu> | 2015-02-17 01:19:51 -0800 |
| commit | 91289b3d95e9baa0ee6f7083f1f74097e4475e93 (patch) | |
| tree | c8032a91271266b35506c7d739e54acd7075d2dc /Makefile | |
| parent | 9b38744f22aa3eaddf22f8a3b4cd0a877a050817 (diff) | |
| download | caffeonacl-91289b3d95e9baa0ee6f7083f1f74097e4475e93.tar.gz caffeonacl-91289b3d95e9baa0ee6f7083f1f74097e4475e93.tar.bz2 caffeonacl-91289b3d95e9baa0ee6f7083f1f74097e4475e93.zip | |
[make] link libcaffe.so before dependencies
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -430,7 +430,7 @@ py: $(PY$(PROJECT)_SO) $(PROTO_GEN_PY) $(PY$(PROJECT)_SO): $(PY$(PROJECT)_SRC) $(PY$(PROJECT)_HXX) | $(DYNAMIC_NAME) @ echo CXX/LD -o $@ $< $(Q)$(CXX) -shared -o $@ $(PY$(PROJECT)_SRC) \ - -o $@ $(LINKFLAGS) $(PYTHON_LDFLAGS) -l$(PROJECT) \ + -o $@ $(LINKFLAGS) -l$(PROJECT) $(PYTHON_LDFLAGS) \ -Wl,-rpath,$(ORIGIN)/../../build/lib mat$(PROJECT): mat @@ -539,7 +539,7 @@ $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR) $(TOOL_BINS) $(EXAMPLE_BINS): %.bin : %.o | $(DYNAMIC_NAME) @ echo CXX/LD -o $@ - $(Q)$(CXX) $< -o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) \ + $(Q)$(CXX) $< -o $@ $(LINKFLAGS) -l$(PROJECT) $(LDFLAGS) \ -Wl,-rpath,$(ORIGIN)/../lib proto: $(PROTO_GEN_CC) $(PROTO_GEN_HEADER) |