[clblas] 06/10: d/rules: further simplification and cleaning

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository clblas.

commit 82e045593dc5bf3eaee58e43c44e54f781dda87c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Oct 27 18:43:54 2015 +0000

    d/rules: further simplification and cleaning
---
 debian/rules               | 18 +++++++++---------
 doc/clBLAS.doxy            |  6 +++---
 src/CMakeLists.txt         |  8 ++++----
 src/library/CMakeLists.txt |  4 ++++
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/debian/rules b/debian/rules
index ef1b74c..3689a60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,9 @@ DEB_CFLAGS_MAINT_APPEND += -mno-altivec
 endif
 
 %:
-	dh $@ --parallel --sourcedirectory=src
+	dh $@ --parallel \
+		--sourcedirectory=src \
+		--dbg-package=libclblas2-dbg
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -34,13 +36,11 @@ override_dh_auto_configure:
 		-DSUFFIX_LIB=/${DEB_HOST_MULTIARCH}
 
 override_dh_auto_build-indep:
-	echo "I: Generating Doxygen documentation"
-	cd doc/ && doxygen clBLAS.doxy
+	cd doc && doxygen clBLAS.doxy
 
-override_dh_auto_clean-indep:
-	dh_auto_clean --indep
-	$(RM) -f doc/doxygen_sqlite3.db
-	$(RM) -rf doc/html
+override_dh_auto_install-indep:
+	# Pass.
 
-override_dh_strip:
-	dh_strip --dbg-package=libclblas2-dbg
+override_dh_auto_clean-indep:
+	rm -rf doc/html
+	rm -f doc/doxygen_sqlite3.db
diff --git a/doc/clBLAS.doxy b/doc/clBLAS.doxy
index afc15ae..03a060a 100644
--- a/doc/clBLAS.doxy
+++ b/doc/clBLAS.doxy
@@ -52,7 +52,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ..\..\bin\clBLAS.doxy
+OUTPUT_DIRECTORY       = 
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -974,7 +974,7 @@ HTML_COLORSTYLE_GAMMA  = 80
 # page will contain the date and time when the page was generated. Setting 
 # this to NO can help when comparing the output of multiple runs.
 
-HTML_TIMESTAMP         = YES
+HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
 # documentation will contain sections that can be hidden and shown after the 
@@ -1223,7 +1223,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # installing MathJax.  However, it is strongly recommended to install a local 
 # copy of MathJax from http://www.mathjax.org before deployment.
 
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+MATHJAX_RELPATH        = /usr/share/javascript/mathjax
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension 
 # names that should be enabled during MathJax rendering.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a176cac..f05c356 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -270,7 +270,7 @@ find_package( OpenCL )
 
 # Find Boost on the system, and configure the type of boost build we want
 set( Boost_USE_MULTITHREADED ON )
-set( Boost_USE_STATIC_LIBS   ON )
+set( Boost_USE_STATIC_LIBS   OFF )
 set( Boost_DETAILED_FAILURE_MSG   ON )
 set( Boost_DEBUG ON )
 set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" )
@@ -296,9 +296,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     # Don't use -rpath.
     set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
 
-    set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
-    set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
-    set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
+    #set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
+    #set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
+    #set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
 
     if(TARGET_PLATFORM EQUAL 32)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin")
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index 377aa9d..707f68e 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -868,6 +868,10 @@ set_target_properties(clBLAS PROPERTIES SOVERSION ${clBLAS_SOVERSION})
 set_target_properties( clBLAS PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
 target_link_libraries(clBLAS ${OPENCL_LIBRARIES} ${MATH_LIBRARY})
 
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+target_link_libraries(clBLAS ${CMAKE_THREAD_LIBS_INIT})
+
 # CPack configuration; include the executable into the package
 install( TARGETS clBLAS
          EXPORT Library

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