More comments in Makefile.config.example

diff --git a/Makefile.config.example b/Makefile.config.example
index b70ccf2..cec85e0 100644 (file)
--- a/Makefile.config.example
+++ b/Makefile.config.example
@@ -1,7 +1,10 @@
+## Refer to http://caffe.berkeleyvision.org/installation.html
+# Contributions simplifying and improving our build system are welcome!
+
 # CUDA directory contains bin/ and lib/ directories that we need.
 CUDA_DIR := /usr/local/cuda
 
-# CUDA architecture setting.
+# CUDA architecture setting: going with all of them.
 CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
     -gencode arch=compute_20,code=sm_21 \
     -gencode arch=compute_30,code=sm_30 \
@@ -10,25 +13,33 @@ CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
 # MKL directory contains include/ and lib/ directions that we need.
 MKL_DIR := /opt/intel/mkl
 
-# NOTE: this is required only if you will compile the matlab interface.
-# MATLAB directory should contain the mex binary in /bin
+# This is required only if you will compile the matlab interface.
+# MATLAB directory should contain the mex binary in /bin.
 MATLAB_DIR := /usr/local
+# MATLAB_DIR := /Applications/MATLAB_R2012b.app
 
 # NOTE: this is required only if you will compile the python interface.
 # We need to be able to find Python.h and numpy/arrayobject.h.
 PYTHON_INCLUDES := /usr/include/python2.7 \
     /usr/local/lib/python2.7/dist-packages/numpy/core/include
+# Anaconda Python distribution is quite popular. Include path:
+# PYTHON_INCLUDES := $(HOME)/anaconda/include \
+    # $(HOME)/anaconda/include/python2.7 \
+    # $(HOME)/anaconda/lib/python2.7/site-packages/numpy/core/include
+
 # We need to be able to find libpythonX.X.so or .dylib.
 PYTHON_LIB := /usr/local/lib
+# PYTHON_LIB := $(HOME)/anaconda/lib
+
+CXX := /usr/bin/g++
+# For OS X, use clang++.
+# CXX := /usr/bin/clang++
+# For OS X 10.9, use libstdc++ instead of libc++ for CUDA compatibility.
+# CXXFLAGS := -stdlib=libstdc++
 
 # Whatever else you find you need goes here.
 INCLUDE_DIRS := $(PYTHON_INCLUDES) /usr/local/include
 LIBRARY_DIRS := $(PYTHON_LIB) /usr/lib /usr/local/lib
 
-# For OS X, use clang++.
-CXX := /usr/bin/g++
-# For OS X 10.9, use libstdc++ instead of libc++ for CUDA compatibility.
-#CXXFLAGS := -stdlib=libstdc++
-
 BUILD_DIR := build
 DISTRIBUTE_DIR := distribute