summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorYangqing Jia <jiayq84@gmail.com>2013-11-21 17:00:57 -0800
committerYangqing Jia <jiayq84@gmail.com>2013-11-21 17:00:57 -0800
commit2b981cf3dc0bd85515ecc1827629a5c753dd789e (patch)
tree4084f60133a9e973577a3cc9000af33df17b6334 /Makefile
parentaee9aa9b2ed14287f3c119a8d0ce494e67e251ca (diff)
downloadcaffeonacl-2b981cf3dc0bd85515ecc1827629a5c753dd789e.tar.gz
caffeonacl-2b981cf3dc0bd85515ecc1827629a5c753dd789e.tar.bz2
caffeonacl-2b981cf3dc0bd85515ecc1827629a5c753dd789e.zip
fix Makefile problem
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0dff043f..ef4af931 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ PROTO_GEN_HEADER := ${PROTO_SRCS:.proto=.pb.h}
PROTO_GEN_CC := ${PROTO_SRCS:.proto=.pb.cc}
PROTO_GEN_PY := ${PROTO_SRCS:.proto=_pb2.py}
# The objects corresponding to the source files
-# These objects will be linked into the final shared library, so we
+# These objects will be linked into the final shared library, so we
# exclude the test and example objects.
CXX_OBJS := ${CXX_SRCS:.cpp=.o}
CU_OBJS := ${CU_SRCS:.cu=.cuo}
@@ -84,7 +84,7 @@ CXXFLAGS += -pthread -fPIC -O2 $(COMMON_FLAGS)
NVCCFLAGS := -Xcompiler -fPIC -O2 $(COMMON_FLAGS)
LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) \
$(foreach library,$(LIBRARIES),-l$(library)) \
- -Wl,-rpath,../libs/
+ -Wl,-rpath,../lib/
PYTHON_LDFLAGS := $(LDFLAGS) $(foreach library,$(PYTHON_LIBRARIES),-l$(library))