From 42a04c9e4366b34302397aaa859fb1c5411e7c49 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 11 Feb 2002 09:05:16 +0000 Subject: [PATCH] Move Makefile.dep out of lib subdir git-svn-id: https://svn.dealii.org/trunk@5485 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/Makefile | 8 ++++---- deal.II/deal.II/Makefile | 8 ++++---- deal.II/lac/Makefile | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index db7e2cd1b0..d70ff1cdf3 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -98,7 +98,7 @@ $(LIBDIR)/libbase.g.so: $(forward-declarations) $(go-files) clean: - -rm -f *~ include/*~ include/*/*~ lib/Makefile.dep + -rm -f *~ include/*~ include/*/*~ Makefile.dep #Rule to generate the dependency file. This file is @@ -110,15 +110,15 @@ clean: #note that here we translate file names with data_out_base #to three file names with the dimension for which we compile #appended -lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile +Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile @echo ============================ Remaking Makefile @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) "-B\$$(LIBDIR)/base" $(cc-files) \ | $(PERL) -p -e 's!(.*/base/data_out_base)(.g?o)!$$1_1d$$2 $$1_2d$$2 $$1_3d$$2 $$1_4d$$2!g;' \ - > lib/Makefile.dep + > Makefile.dep # include all the dependencies -include lib/Makefile.dep +include Makefile.dep # include a rule which tells how to remake the forward declarations file include $D/common/scripts/forward_declarations diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index f9a8091883..e9f85702de 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -151,16 +151,16 @@ $(LIBDIR)/libdeal_II_3d.so: $(o-files-3d) #one of the cc-/h-files changed. Make detects whether #to remake this file upon inclusion at the bottom #of this file. -lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile +Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile @echo ============================ Remaking Makefile @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) "-B\$$(LIBDIR)" $(cc-files) \ | $(PERL) -p -e 's!LIBDIR\)/(.*):!LIBDIR)/DIM_PLACEHOLDER/$$1:!g;' \ | $(PERL) -pe 's!(\.g?o):!_DIM_PLACEHOLDER$$1:!g;' \ | $(PERL) -pe 's!^(.*)/DIM_PLACEHOLDER/(.*)_DIM_PLACEHOLDER(\..*):!$$1/1d/$$2_1d$$3 $$1/2d/$$2_2d$$3 $$1/3d/$$2_3d$$3:!g;'\ - > lib/Makefile.dep + > Makefile.dep # include all the dependencies -include lib/Makefile.dep +include Makefile.dep # include a rule which tells how to remake the forward declarations file include $D/common/scripts/forward_declarations @@ -171,7 +171,7 @@ include $D/common/scripts/forward_declarations ################### some clean-up rules clean: - -rm -f *~ */*~ */*/*~ + -rm -f *~ */*~ */*/*~ Makefile.dep cd lib ; $(MAKE) clean diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index ab86b2f50b..951ab6b68b 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -71,7 +71,7 @@ $(LIBDIR)/liblac.g.so: $(forward-declarations) $(go-files) clean: - -rm -f *~ include/*~ include/*/*~ lib/Makefile.dep + -rm -f *~ include/*~ include/*/*~ Makefile.dep #Rule to generate the dependency file. This file is @@ -79,13 +79,13 @@ clean: #one of the cc-/h-files changed. Make detects whether #to remake this file upon inclusion at the bottom #of this file. -lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile +Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile @echo ============================ Remaking Makefile @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) "-B\$$(LIBDIR)/lac" $(cc-files) \ - > lib/Makefile.dep + > Makefile.dep # include all the dependencies -include lib/Makefile.dep +include Makefile.dep # include a rule which tells how to remake the forward declarations file include $D/common/scripts/forward_declarations -- 2.39.5