[caffe-contrib] 89/362: d/rules: try to let it build again

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.

commit 294581620e5246c1b4e7e2c840b7f7edc5d16a26
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Aug 31 01:30:13 2015 +0000

    d/rules: try to let it build again
---
 debian/rules | 75 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/debian/rules b/debian/rules
index b442f34..7a38779 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,58 +17,59 @@ ifeq (i386, $(DEB_HOST_ARCH))
 	flag_build_caffe_cuda := y
 endif
 
+CONFFLAG_CPU = \
+	-DBLAS="Open" \
+	-DCMAKE_SKIP_RPATH=TRUE \
+	-DCPU_ONLY=ON \
+	-DUSE_CUDNN=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_python=ON \
+	-Dpython_version="2" \
+	-DBUILD_matlab=OFF \
+	-DBUILD_docs=ON \
+	-DBUILD_python_layer=ON \
+	-DCMAKE_VERBOSE_MAKEFILE=ON
+CONFFLAG_CUDA = \
+	-DBLAS="Open" \
+	-DCMAKE_SKIP_RPATH=TRUE \
+	-DCPU_ONLY=OFF \
+	-DUSE_CUDNN=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_python=ON \
+	-Dpython_version="2" \
+	-DBUILD_matlab=OFF \
+	-DBUILD_docs=ON \
+	-DBUILD_python_layer=ON \
+	-DCMAKE_VERBOSE_MAKEFILE=ON
+
 %:
 	dh $@ --parallel \
 	      --buildsystem=cmake \
 		  --builddirectory=${CAFFE_CPU_BUILDDIR}
-ifeq (y,$(flag_build_caffe_cuda))
-		dh $@ --parallel \
-			  --buildsystem=cmake \
-			  --builddirectory=${CAFFE_CUDA_BUILDDIR}
-endif
 
 override_dh_auto_configure:
-	-mkdir $(CAFFE_CPU_BUILDDIR)
 	dh_auto_configure \
 		--builddirectory=${CAFFE_CPU_BUILDDIR} \
-		-- \
-		-DBLAS="Open" \
-		-DCMAKE_SKIP_RPATH=TRUE \
-		-DCPU_ONLY=ON \
-		-DUSE_CUDNN=OFF \
-		-DBUILD_SHARED_LIBS=ON \
-		-DBUILD_python=ON \
-		-Dpython_version="2" \
-		-DBUILD_matlab=OFF \
-		-DBUILD_docs=ON \
-		-DBUILD_python_layer=ON \
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-ifeq (y,$(flag_build_caffe_cuda))
-	-mkdir $(CAFFE_CUDA_BUILDDIR)
+		-- $(CONFFLAG_CPU)
+ifeq (y, $(flag_build_caffe_cuda))
 	dh_auto_configure \
 		--builddirectory=${CAFFE_CUDA_BUILDDIR} \
-		-- \
-		-DBLAS="Open" \
-		-DCMAKE_SKIP_RPATH=TRUE \
-		-DCPU_ONLY=OFF \
-		-DUSE_CUDNN=OFF \
-		-DBUILD_SHARED_LIBS=ON \
-		-DBUILD_python=ON \
-		-Dpython_version="2" \
-		-DBUILD_matlab=OFF \
-		-DBUILD_docs=ON \
-		-DBUILD_python_layer=ON \
-		-DCMAKE_CXX_COMPILER=g++-4.6 \
-		-DCMAKE_C_COMPILER=gcc-4.6 \
-		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-- $(CONFFLAG_CUDA)
 endif	
 
 override_dh_auto_clean:
-	dh_testdir
-	-$(RM) -rf ${CAFFE_CPU_BUILDDIR} ${CAFFE_CUDA_BUILDDIR} \
-		python/caffe/proto/
+	dh_auto_clean --builddirectory=${CAFFE_CPU_BUILDDIR}
+	dh_auto_clean --builddirectory=${CAFFE_CUDA_BUILDDIR}
+	#-$(RM) -rf ${CAFFE_CPU_BUILDDIR} ${CAFFE_CUDA_BUILDDIR}
+	-$(RM) -rf python/caffe/proto/
 	-$(RM) python/caffe/_caffe.so
 
+override_dh_auto_build:
+	dh_auto_build --builddirectory=${CAFFE_CPU_BUILDDIR}	
+ifeq (y, $(flag_build_caffe_cuda))
+	dh_auto_build --builddirectory=${CAFFE_CUDA_BUILDDIR} 
+endif
+
 # In the test phase, we need to set LD_LIBRARY_PATH properly
 # for those test ELFs linked with libcaffe.so.X
 #override_dh_auto_test: config

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe-contrib.git