From: wolf Date: Tue, 8 Sep 1998 11:11:42 +0000 (+0000) Subject: Make makefiles work again after Guido's changes. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35c0482a86244feedc46e44e18148628aa462265;p=dealii-svn.git Make makefiles work again after Guido's changes. git-svn-id: https://svn.dealii.org/trunk@587 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/Makefile b/deal.II/deal.II/Attic/examples/Makefile index 1a75c07be4..452c446d48 100644 --- a/deal.II/deal.II/Attic/examples/Makefile +++ b/deal.II/deal.II/Attic/examples/Makefile @@ -17,7 +17,7 @@ compile: $(compile) run : $(run) # for cleaning up: do this also for the present directory clean : $(clean) - rm -f *~ + -rm -f *~ # define the action of the targets for the specific subdirectories @@ -28,4 +28,4 @@ $(run) : cd $(@:.run=) ; make run $(clean) : - cd $(@:.clean=) ; make clean + -cd $(@:.clean=) ; make clean diff --git a/deal.II/deal.II/Attic/examples/convergence/Makefile b/deal.II/deal.II/Attic/examples/convergence/Makefile index 022319dc4e..e982c12567 100644 --- a/deal.II/deal.II/Attic/examples/convergence/Makefile +++ b/deal.II/deal.II/Attic/examples/convergence/Makefile @@ -39,6 +39,9 @@ delete-files = *gnuplot *.eps *ucd *history include ../../Make.global_options +#deal include base path +D = ../../.. + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -92,7 +95,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) diff --git a/deal.II/deal.II/Attic/examples/dof/Makefile b/deal.II/deal.II/Attic/examples/dof/Makefile index 8a5bbfb806..29dee59245 100644 --- a/deal.II/deal.II/Attic/examples/dof/Makefile +++ b/deal.II/deal.II/Attic/examples/dof/Makefile @@ -38,6 +38,8 @@ delete-files = grid* sparsity* *.eps include ../../Make.global_options +#deal include base path +D = ../../.. # get lists of files we need cc-files = $(wildcard *.cc) @@ -92,7 +94,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) diff --git a/deal.II/deal.II/Attic/examples/error-estimation/Makefile b/deal.II/deal.II/Attic/examples/error-estimation/Makefile index 525d0007c7..9551e88f5a 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/Makefile +++ b/deal.II/deal.II/Attic/examples/error-estimation/Makefile @@ -44,6 +44,9 @@ delete-files = data-*/* include ../../Make.global_options +#deal include base path +D = ../../.. + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -94,7 +97,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) diff --git a/deal.II/deal.II/Attic/examples/grid/Makefile b/deal.II/deal.II/Attic/examples/grid/Makefile index 26d900911f..761d643cd3 100644 --- a/deal.II/deal.II/Attic/examples/grid/Makefile +++ b/deal.II/deal.II/Attic/examples/grid/Makefile @@ -38,6 +38,8 @@ delete-files = grid.? *.eps include ../../Make.global_options +#deal include base path +D = ../../.. # get lists of files we need cc-files = $(wildcard *.cc) diff --git a/deal.II/deal.II/Attic/examples/multigrid/Makefile b/deal.II/deal.II/Attic/examples/multigrid/Makefile index 884d655e97..cad3118764 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/Makefile +++ b/deal.II/deal.II/Attic/examples/multigrid/Makefile @@ -39,6 +39,9 @@ delete-files = *gnuplot *.eps *ucd *history include ../../Make.global_options +#deal include base path +D = ../../.. + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -92,7 +95,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index 48d95fb5e0..ec4388a4f2 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -39,6 +39,9 @@ delete-files = gnuplot* *.eps include ../../Make.global_options +#deal include base path +D = ../../.. + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -92,7 +95,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) diff --git a/deal.II/deal.II/Make.global_options b/deal.II/deal.II/Make.global_options index 279554aec8..dd7cdcb03c 100644 --- a/deal.II/deal.II/Make.global_options +++ b/deal.II/deal.II/Make.global_options @@ -31,12 +31,10 @@ CXX = /home/wolf/bin/gcc/bin/c++ endif %.go : %.cc Makefile - @echo ======================== Compiling (DEBUG): $< -# @echo $(CXX) ... -c $< -o $@ + @echo "======================== Compiling (DEBUG):" $< @$(CXX) $(CXXFLAGS.g) -c $< -o $@ %.o : %.cc Makefile - @echo ======================== Compiling (OPT): $< -# @echo $(CXX) ... -c $< -o $@ + @echo "======================== Compiling (OPT): " $< @$(CXX) $(CXXFLAGS) -c $< -o $@ diff --git a/tests/big-tests/Makefile b/tests/big-tests/Makefile index 1a75c07be4..452c446d48 100644 --- a/tests/big-tests/Makefile +++ b/tests/big-tests/Makefile @@ -17,7 +17,7 @@ compile: $(compile) run : $(run) # for cleaning up: do this also for the present directory clean : $(clean) - rm -f *~ + -rm -f *~ # define the action of the targets for the specific subdirectories @@ -28,4 +28,4 @@ $(run) : cd $(@:.run=) ; make run $(clean) : - cd $(@:.clean=) ; make clean + -cd $(@:.clean=) ; make clean diff --git a/tests/big-tests/convergence/Makefile b/tests/big-tests/convergence/Makefile index 022319dc4e..e982c12567 100644 --- a/tests/big-tests/convergence/Makefile +++ b/tests/big-tests/convergence/Makefile @@ -39,6 +39,9 @@ delete-files = *gnuplot *.eps *ucd *history include ../../Make.global_options +#deal include base path +D = ../../.. + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -92,7 +95,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index 8a5bbfb806..29dee59245 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -38,6 +38,8 @@ delete-files = grid* sparsity* *.eps include ../../Make.global_options +#deal include base path +D = ../../.. # get lists of files we need cc-files = $(wildcard *.cc) @@ -92,7 +94,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) diff --git a/tests/big-tests/error-estimation/Makefile b/tests/big-tests/error-estimation/Makefile index 525d0007c7..9551e88f5a 100644 --- a/tests/big-tests/error-estimation/Makefile +++ b/tests/big-tests/error-estimation/Makefile @@ -44,6 +44,9 @@ delete-files = data-*/* include ../../Make.global_options +#deal include base path +D = ../../.. + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -94,7 +97,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) diff --git a/tests/big-tests/grid/Makefile b/tests/big-tests/grid/Makefile index 26d900911f..761d643cd3 100644 --- a/tests/big-tests/grid/Makefile +++ b/tests/big-tests/grid/Makefile @@ -38,6 +38,8 @@ delete-files = grid.? *.eps include ../../Make.global_options +#deal include base path +D = ../../.. # get lists of files we need cc-files = $(wildcard *.cc) diff --git a/tests/big-tests/multigrid/Makefile b/tests/big-tests/multigrid/Makefile index 884d655e97..cad3118764 100644 --- a/tests/big-tests/multigrid/Makefile +++ b/tests/big-tests/multigrid/Makefile @@ -39,6 +39,9 @@ delete-files = *gnuplot *.eps *ucd *history include ../../Make.global_options +#deal include base path +D = ../../.. + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -92,7 +95,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index 48d95fb5e0..ec4388a4f2 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -39,6 +39,9 @@ delete-files = gnuplot* *.eps include ../../Make.global_options +#deal include base path +D = ../../.. + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -92,7 +95,7 @@ Obj.g.a: ./Obj.g.a($(go-files)) clean: - rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files) + -rm -f *.o *.go *~ Makefile.dep Obj.a Obj.g.a $(target) $(delete-files)