From 24bee7ccfe906ae967e276bb58625b9788d5c7e7 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 11 Feb 2002 09:39:44 +0000 Subject: [PATCH] Finish the _clean_ rules for the new directory structure. git-svn-id: https://svn.dealii.org/trunk@5490 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/Makefile | 2 +- deal.II/base/Makefile | 2 +- deal.II/common/scripts/make_dependencies.pl | 23 ++++++++++++--------- deal.II/deal.II/Makefile | 2 +- deal.II/lac/Makefile | 2 +- deal.II/lib/Makefile | 23 +++++++++++++++++++++ 6 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 deal.II/lib/Makefile diff --git a/deal.II/Makefile b/deal.II/Makefile index 1ae508ab53..80e255cb80 100644 --- a/deal.II/Makefile +++ b/deal.II/Makefile @@ -148,7 +148,7 @@ clean-examples: cd $D/examples ; $(MAKE) clean clean-lib: - -rm $(LIBDIR)/lib* + cd $D/lib ; $(MAKE) clean # if that directory exists, go into 'tests' and clean up there as well clean-tests: diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index 0941593811..cf452ae929 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -1,5 +1,5 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998, 1999 +# Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000, 2001, 2002 diff --git a/deal.II/common/scripts/make_dependencies.pl b/deal.II/common/scripts/make_dependencies.pl index fdcdb08891..23bb1a8bbc 100644 --- a/deal.II/common/scripts/make_dependencies.pl +++ b/deal.II/common/scripts/make_dependencies.pl @@ -1,19 +1,22 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998 +# Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000, 2001, 2002 -#Make a dependency file tree -#usage: make_dep -Iinc_path1 -Iinc_path2 ... -Bbasepath files +# Make a dependency file tree +# usage: make_dep -Iinc_path1 -Iinc_path2 ... -Bbasepath files -#This program makes for each of the given files a makefile dependency -#list, also considering nested includes. It only considers included -#files which are located in the given include pathes (you can give any -#number of pathes). The output looks like this: +# This program makes for each of the given files a makefile dependency +# list, also considering nested includes. It only considers included +# files which are located in the given include pathes (you can give any +# number of pathes). The output looks like this: # -#lib/o/.o-file: file included_files -#lib/go/.g.o-file: file included_files +# $basepath/.o-file: file included_files +# $basepath/.g.o-file: file included_files +# +# $basepath is the dir where the object files are to be placed (as +# given by the -B parameter to this script) -#Author: Wolfgang Bangerth, 1998, 1999, 2000, 2001, 2002 +# Author: Wolfgang Bangerth, 1998, 1999, 2000, 2001, 2002 diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index a9d0634b34..58fc4fa56b 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -1,5 +1,5 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998, 1999 +# Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000, 2001, 2002 # deal.II top level directory diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index 2fd841f0cf..a1bf983b75 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -1,5 +1,5 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998, 1999 +# Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000, 2001, 2002 # deal.II top level directory diff --git a/deal.II/lib/Makefile b/deal.II/lib/Makefile new file mode 100644 index 0000000000..15747e8cc3 --- /dev/null +++ b/deal.II/lib/Makefile @@ -0,0 +1,23 @@ +# $Id$ +# Copyright W. Bangerth, University of Heidelberg, 2002 + + +default: + @echo There is no default target in this directory + + +# clean everything +clean: clean-objects + -rm lib* + +# only clean object files, not libraries +clean-objects: clean-base clean-lac clean-1d clean-2d clean-3d + + +# clean targets for the individual subdirectories. +# extract dir name from target +clean-%: + -cd $(@:clean-%=%) ; rm *.o + + +.PHONY: clean clean-objects clean-base clean-lac clean-1d clean-2d clean-3d -- 2.39.5