From 7361c5fd356548b5225fb29cea9bbd5a535b3668 Mon Sep 17 00:00:00 2001 From: Slava Aseev Date: Thu, 30 May 2019 16:47:29 +0300 Subject: [PATCH] Rename build directory - Rename 'build' with 'BUILD' for %cmake macro - Remove passing cmake options from Makefile's --- GraphBLAS/Makefile | 16 ++++++++-------- Mongoose/Makefile | 14 +++++++------- metis-5.1.0/Makefile | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/GraphBLAS/Makefile b/GraphBLAS/Makefile index d08a68463..d2cf65237 100644 --- a/GraphBLAS/Makefile +++ b/GraphBLAS/Makefile @@ -16,11 +16,11 @@ default: library # just build the dynamic library, not the demos library: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; $(MAKE) --jobs=$(JOBS) ) + ( cd BUILD ; cmake .. ; $(MAKE) --jobs=$(JOBS) ) # build the dynamic library and the demos all: - ( cd build ; cmake $(CMAKE_OPTIONS) -DDEMO=1 .. ; $(MAKE) --jobs=$(JOBS) ) + ( cd BUILD ; cmake $(CMAKE_OPTIONS) -DDEMO=1 .. ; $(MAKE) --jobs=$(JOBS) ) # just run the demos run: all @@ -28,20 +28,20 @@ run: all # just do 'make' in build; do not rerun the cmake script remake: - ( cd build ; $(MAKE) --jobs=$(JOBS) ) + ( cd BUILD ; $(MAKE) --jobs=$(JOBS) ) # just run cmake; do not compile cmake: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; ) + ( cd BUILD ; cmake $(CMAKE_OPTIONS) .. ; ) # build both the static and dynamic libraries; do not run the demo static: - ( cd build ; cmake $(CMAKE_OPTIONS) -DBUILD_GRB_STATIC_LIBRARY=1 .. ; $(MAKE) --jobs=$(JOBS) ) + ( cd BUILD ; cmake $(CMAKE_OPTIONS) -DBUILD_GRB_STATIC_LIBRARY=1 .. ; $(MAKE) --jobs=$(JOBS) ) # installs GraphBLAS to the install location defined by cmake, usually # /usr/local/lib and /usr/local/include install: - ( cd build ; $(MAKE) install ) + ( cd BUILD ; $(MAKE) install ) # create the Doc/GraphBLAS_UserGuide.pdf docs: @@ -53,7 +53,7 @@ gpu: # remove any installed libraries and #include files uninstall: - - xargs rm < build/install_manifest.txt + - xargs rm < BUILD/install_manifest.txt clean: distclean @@ -61,7 +61,7 @@ purge: distclean # remove all files not in the distribution distclean: - rm -rf build/* Demo/*.out Demo/complex_demo_out*.m Tcov/log.txt + rm -rf BUILD/* Demo/*.out Demo/complex_demo_out*.m Tcov/log.txt rm -rf Config/*.tmp Source/control.m4 rm -rf Doc/html/* Doc/*.tmp ( cd GraphBLAS ; $(MAKE) distclean ) diff --git a/Mongoose/Makefile b/Mongoose/Makefile index 3ff8f10ba..9a3a1816b 100644 --- a/Mongoose/Makefile +++ b/Mongoose/Makefile @@ -15,11 +15,11 @@ JOBS ?= 1 # build the Mongoose library (static and dynamic) and run a quick test default: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; $(MAKE) --jobs=$(JOBS) ; ./bin/demo ) + ( cd BUILD ; cmake .. ; $(MAKE) --jobs=$(JOBS) ; ./bin/demo ) # just build the static and dynamic libraries; do not run the demo library: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; $(MAKE) --jobs=$(JOBS) ) + ( cd BUILD ; cmake .. ; $(MAKE) --jobs=$(JOBS) ) # the same as "make library" static: library @@ -27,19 +27,19 @@ static: library # installs Mongoose to the install location defined by cmake, usually # /usr/local/lib and /usr/local/include install: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; $(MAKE) --jobs=$(JOBS) ; $(MAKE) install ) + ( cd BUILD ; cmake .. ; $(MAKE) --jobs=$(JOBS) ; $(MAKE) install ) # create the Doc/Mongoose_UserGuide.pdf docs: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; $(MAKE) userguide ) + ( cd BUILD ; cmake .. ; $(MAKE) userguide ) # remove any installed libraries and #include files uninstall: - - xargs rm < build/install_manifest.txt + - xargs rm < BUILD/install_manifest.txt # run the extensive tests test: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; $(MAKE) test ) + ( cd BUILD ; cmake .. ; $(MAKE) test ) clean: distclean @@ -47,6 +47,6 @@ purge: distclean # remove all files not in the distribution distclean: - rm -rf build/* Lib/* MATLAB/*.mex* + rm -rf BUILD/* Lib/* MATLAB/*.mex* rm -rf SuiteSparse_config/*.o SuiteSparse_config/*.a diff --git a/metis-5.1.0/Makefile b/metis-5.1.0/Makefile index 9cc03b960..f4ef12a73 100644 --- a/metis-5.1.0/Makefile +++ b/metis-5.1.0/Makefile @@ -16,7 +16,7 @@ cc = not-set cputype = $(shell uname -m | sed "s/\\ /_/g") systype = $(shell uname -s) -BUILDDIR = build/$(systype)-$(cputype) +BUILDDIR = BUILD # Process configuration options. CONFIG_FLAGS = -- 2.29.3