From 1788c805ad40e14436eb04b42d626c4ae45b5a2b Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sun, 9 Dec 2007 17:29:38 +0000 Subject: [PATCH] Improve the Makefile that wouldn't have the dependency on the source/*.inst files yet because they weren't generated at the time when make_dependencies ran, and the latter program simply ignores files it can't find. git-svn-id: https://svn.dealii.org/trunk@15575 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index 3b7189f5ba..fe8d8b4c06 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -16,6 +16,9 @@ o-files = $(o-files-base) go-files = $(o-files-base:.$(OBJEXT)=.g.$(OBJEXT)) h-files = $(sort $(shell echo include/lac/*.h)) +inst-in-files= $(shell echo source/*.inst.in) +inst-files = $(inst-in-files:%.in=%) + # if umfpack was configured, simply link all the umfpack files into liblac. # these object files should have been generated before we got to the present # directory @@ -40,7 +43,7 @@ $(LIBDIR)/lac/%.$(OBJEXT) : @echo "=====lac==============optimized==$(MT)== $( $@ @@ -121,16 +124,12 @@ clean: # # If the command fails, then remove Makefile.dep again and fail Makefile.dep: $(cc-files) $(h-files) \ - $(shell echo source/*.inst.in) \ + $(inst-files) \ Makefile $D/common/Make.global_options - @echo ============================ Remaking lac/Makefile - @$D/common/scripts/make_dependencies $(INCLUDE) "-B$(LIBDIR)/lac" $(cc-files) \ + @echo ===================================== Remaking lac/Makefile + @$D/common/scripts/make_dependencies $(INCLUDE) "-B$(LIBDIR)/lac" source/full_matrix.cc \ > $@ \ || (rm -f $@ ; false) - @for i in source/*inst.in ; do \ - echo "$${i}.x : $${i}" | \ - $(PERL) -pi -e 's/\.inst\.in\.x/.inst/g;' ; \ - done >> $@ # include all the dependencies -- 2.39.5