From 41452d1a17eb1bc67b8e23dad1ca2d13531ed8d8 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 19 Nov 2010 01:32:45 +0000 Subject: [PATCH] Take over patches from TBB 22 copy in our tree. git-svn-id: https://svn.dealii.org/trunk@22815 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/contrib/tbb/tbb30_104oss/Makefile | 20 +++++++------- .../tbb/tbb30_104oss/build/Makefile.tbb | 11 +++++--- .../tbb/tbb30_104oss/build/common_rules.inc | 26 ++++++++++++------- .../tbb/tbb30_104oss/build/windows.inc | 2 +- 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/deal.II/contrib/tbb/tbb30_104oss/Makefile b/deal.II/contrib/tbb/tbb30_104oss/Makefile index f8faec09b4..5d6d930a37 100644 --- a/deal.II/contrib/tbb/tbb30_104oss/Makefile +++ b/deal.II/contrib/tbb/tbb30_104oss/Makefile @@ -37,22 +37,22 @@ default: tbb tbbmalloc all: tbb tbbmalloc test examples tbb: mkdir - $(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.tbb cfg=debug tbb_root=$(tbb_root) - $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbb cfg=release tbb_root=$(tbb_root) + @$(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.tbb cfg=debug tbb_root=$(tbb_root) + @$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbb cfg=release tbb_root=$(tbb_root) tbbmalloc: mkdir - $(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc tbb_root=$(tbb_root) - $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc tbb_root=$(tbb_root) + @$(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc tbb_root=$(tbb_root) + @$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc tbb_root=$(tbb_root) test: tbb tbbmalloc - -$(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test tbb_root=$(tbb_root) - -$(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.test cfg=debug tbb_root=$(tbb_root) - -$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test tbb_root=$(tbb_root) - -$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.test cfg=release tbb_root=$(tbb_root) + -@$(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test tbb_root=$(tbb_root) + -@$(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.test cfg=debug tbb_root=$(tbb_root) + -@$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test tbb_root=$(tbb_root) + -@$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.test cfg=release tbb_root=$(tbb_root) rml: mkdir - $(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.rml cfg=debug tbb_root=$(tbb_root) - $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.rml cfg=release tbb_root=$(tbb_root) + @$(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.rml cfg=debug tbb_root=$(tbb_root) + @$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.rml cfg=release tbb_root=$(tbb_root) examples: tbb tbbmalloc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/Makefile.tbb b/deal.II/contrib/tbb/tbb30_104oss/build/Makefile.tbb index 2f49eabe30..3b580004fd 100644 --- a/deal.II/contrib/tbb/tbb30_104oss/build/Makefile.tbb +++ b/deal.II/contrib/tbb/tbb30_104oss/build/Makefile.tbb @@ -36,7 +36,7 @@ DEBUG_SUFFIX=$(findstring _debug,_$(cfg)) #------------------------------------------------------------ # Define static pattern rules dealing with .cpp source files #------------------------------------------------------------ -$(warning CONFIG: cfg=$(cfg) arch=$(arch) compiler=$(compiler) os=$(tbb_os) runtime=$(runtime)) +# $(warning CONFIG: cfg=$(cfg) arch=$(arch) compiler=$(compiler) os=$(tbb_os) runtime=$(runtime)) default_tbb: $(TBB.DLL) .PHONY: default_tbb tbbvars clean @@ -102,7 +102,8 @@ include $(tbb_root)/build/common_rules.inc ifneq (,$(TBB.DEF)) tbb.def: $(TBB.DEF) - $(CMD) "$(CPLUS) $(PREPROC_ONLY) $(TBB.DEF) $(INCLUDES) $(CPLUS_FLAGS) >tbb.def 2>$(NUL) || exit 0" + @echo "=====tbb=========================MT== $(cfg)/$@" + @$(CMD) "$(CPLUS) $(PREPROC_ONLY) $(TBB.DEF) $(INCLUDES) $(CPLUS_FLAGS) >tbb.def 2>$(NUL) || exit 0" LIB_LINK_FLAGS += $(EXPORT_KEY)tbb.def $(TBB.DLL): tbb.def @@ -113,11 +114,13 @@ tbbvars.sh: $(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL) $(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL) - $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS) + @echo "=====tbb=========================MT== $(cfg)/$@" + @$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS) ifneq (,$(TBB_NO_VERSION.DLL)) $(TBB_NO_VERSION.DLL): - echo "INPUT ($(TBB.DLL))" > $(TBB_NO_VERSION.DLL) + @echo "=====tbb=========================MT== $(cfg)/$@" + @echo "INPUT ($(TBB.DLL))" > $(TBB_NO_VERSION.DLL) endif #clean: diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/common_rules.inc b/deal.II/contrib/tbb/tbb30_104oss/build/common_rules.inc index 95dbad2071..07ec7b3f31 100644 --- a/deal.II/contrib/tbb/tbb30_104oss/build/common_rules.inc +++ b/deal.II/contrib/tbb/tbb30_104oss/build/common_rules.inc @@ -57,13 +57,16 @@ CONLY ?= $(CPLUS) # The most generic rules %.$(OBJ): %.cpp - $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< + @echo "=====tbb=========================MT== $(cfg)/$($*.tmp @@ -90,14 +93,17 @@ ifeq (1,$(TBB_NOSTRICT)) # The files below need the -strict-ansi flag downgraded to -ansi to compile $(KNOWN_NOSTRICT): %.$(OBJ): %.cpp - $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS_NOSTRICT) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< + @echo "=====tbb=========================MT== $(cfg)/$($@ @@ -112,12 +118,14 @@ $(TBB.MANIFEST): cl /nologo $(C_FLAGS) tbbmanifest.c version_string.tmp: $(TBB.MANIFEST) - $(MAKE_VERSIONS) - cmd /C "echo #define TBB_MANIFEST 1 >> version_string.tmp" + @echo "=====tbb=========================MT== $(cfg)/$@" + @$(MAKE_VERSIONS) + @cmd /C "echo #define TBB_MANIFEST 1 >> version_string.tmp" else version_string.tmp: - $(MAKE_VERSIONS) + @echo "=====tbb=========================MT== $(cfg)/$@" + @$(MAKE_VERSIONS) endif diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/windows.inc b/deal.II/contrib/tbb/tbb30_104oss/build/windows.inc index 3900ed382b..fe446bbf49 100644 --- a/deal.II/contrib/tbb/tbb30_104oss/build/windows.inc +++ b/deal.II/contrib/tbb/tbb30_104oss/build/windows.inc @@ -50,7 +50,7 @@ CWD=$(shell cmd /C echo %CD%) RM=cmd /C del /Q /F RD=cmd /C rmdir MD=cmd /c mkdir -SLASH=\\ +SLASH=/ NUL = nul OBJ = obj -- 2.39.5