From: Wolfgang Bangerth Date: Tue, 14 Apr 1998 12:09:15 +0000 (+0000) Subject: Update makefile for new example. X-Git-Tag: v8.0.0~23086 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95095caed2303940b61907111dc43697ef736e6b;p=dealii.git Update makefile for new example. git-svn-id: https://svn.dealii.org/trunk@168 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/Makefile b/deal.II/deal.II/Attic/examples/Makefile index a2081adda0..9d1e1501ce 100644 --- a/deal.II/deal.II/Attic/examples/Makefile +++ b/deal.II/deal.II/Attic/examples/Makefile @@ -3,18 +3,17 @@ CXX=c++ INCLUDE = -I../include -I../../lac/include -I../../base/include CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) + -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) + -fno-rtti -fno-exceptions LIBPATH = -L../lib -L../../lac/lib LIBFILES.g= ../lib/libbasic.g.a ../lib/libgrid.g.a \ ../lib/libfe.g.a ../lib/libnumerics.g.a \ ../../lac/lib/liblac.g.a LIBFILES = $(LIBFILES.g:.g.a=.a) -LIBS.g = $(LIBPATH) -lbasic.g -lgrid.g -lfe.g -lnumerics.g -llac.g +LIBS.g = $(LIBPATH) -lgrid.g -lfe.g -lnumerics.g -llac.g -lbasic.g LIBS = $(LIBS.g:.g=) @@ -26,7 +25,7 @@ ifeq ($(shell uname),SunOS) CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif -cc-files = grid/grid_test.cc dof/dof_test.cc poisson/poisson.cc +cc-files = grid/grid_test.cc dof/dof_test.cc poisson/poisson.cc convergence/convergence.cc o-files = $(cc-files:.cc=.o) h-files = $(wildcard ../include/*.h) @@ -34,7 +33,7 @@ examples: $(cc-files:.cc=) %.o : %.cc @echo ================= Compiling $< - @$(CXX) $(CXXFLAGS.g) -o $@ -g -c $< + @$(CXX) $(CXXFLAGS.g) $(INCLUDE) -o $@ -g -c $< grid/grid_test: grid/grid_test.o $(LIBFILES) @echo ================= Linking $@ @@ -47,8 +46,12 @@ dof/dof_test: dof/dof_test.o $(LIBFILES.g) poisson/poisson: @cd poisson ; make +convergence/convergence: convergence/convergence.o $(LIBFILES.g) + @echo ================= Linking $@ + @$(CXX) $(CXXFLAGS.g) -o $@ $< $(LIBS) ../../mia/control.o + -run: run_grid_test run_dof_test run_poisson_test +run: run_grid_test run_dof_test run_poisson_test run_convergence_test run_grid_test: cd grid ; grid_test 4 ; mv grid.1 grid.4 @@ -64,13 +67,18 @@ run_dof_test: run_poisson_test: cd poisson ; make run +run_convergence_test: + cd convergence ; convergence + cd convergence ; gnuplot make_ps + clean: cd grid ; rm -f grid.[1234] *.eps *.o *~ grid_test cd dof ; rm -f grid.* sparsity.* *.o *~ dof_test cd poisson ; make clean + cd convergence ; rm -f *.o convergence *~ *.eps gnuplot.* -.PHONY: run run_grid_test run_dof_test run_poisson_test clean +.PHONY: run run_grid_test run_dof_test run_poisson_test run_convergence_test clean #Rule to generate the dependency file. This file is diff --git a/tests/big-tests/Makefile b/tests/big-tests/Makefile index a2081adda0..9d1e1501ce 100644 --- a/tests/big-tests/Makefile +++ b/tests/big-tests/Makefile @@ -3,18 +3,17 @@ CXX=c++ INCLUDE = -I../include -I../../lac/include -I../../base/include CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) + -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) + -fno-rtti -fno-exceptions LIBPATH = -L../lib -L../../lac/lib LIBFILES.g= ../lib/libbasic.g.a ../lib/libgrid.g.a \ ../lib/libfe.g.a ../lib/libnumerics.g.a \ ../../lac/lib/liblac.g.a LIBFILES = $(LIBFILES.g:.g.a=.a) -LIBS.g = $(LIBPATH) -lbasic.g -lgrid.g -lfe.g -lnumerics.g -llac.g +LIBS.g = $(LIBPATH) -lgrid.g -lfe.g -lnumerics.g -llac.g -lbasic.g LIBS = $(LIBS.g:.g=) @@ -26,7 +25,7 @@ ifeq ($(shell uname),SunOS) CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif -cc-files = grid/grid_test.cc dof/dof_test.cc poisson/poisson.cc +cc-files = grid/grid_test.cc dof/dof_test.cc poisson/poisson.cc convergence/convergence.cc o-files = $(cc-files:.cc=.o) h-files = $(wildcard ../include/*.h) @@ -34,7 +33,7 @@ examples: $(cc-files:.cc=) %.o : %.cc @echo ================= Compiling $< - @$(CXX) $(CXXFLAGS.g) -o $@ -g -c $< + @$(CXX) $(CXXFLAGS.g) $(INCLUDE) -o $@ -g -c $< grid/grid_test: grid/grid_test.o $(LIBFILES) @echo ================= Linking $@ @@ -47,8 +46,12 @@ dof/dof_test: dof/dof_test.o $(LIBFILES.g) poisson/poisson: @cd poisson ; make +convergence/convergence: convergence/convergence.o $(LIBFILES.g) + @echo ================= Linking $@ + @$(CXX) $(CXXFLAGS.g) -o $@ $< $(LIBS) ../../mia/control.o + -run: run_grid_test run_dof_test run_poisson_test +run: run_grid_test run_dof_test run_poisson_test run_convergence_test run_grid_test: cd grid ; grid_test 4 ; mv grid.1 grid.4 @@ -64,13 +67,18 @@ run_dof_test: run_poisson_test: cd poisson ; make run +run_convergence_test: + cd convergence ; convergence + cd convergence ; gnuplot make_ps + clean: cd grid ; rm -f grid.[1234] *.eps *.o *~ grid_test cd dof ; rm -f grid.* sparsity.* *.o *~ dof_test cd poisson ; make clean + cd convergence ; rm -f *.o convergence *~ *.eps gnuplot.* -.PHONY: run run_grid_test run_dof_test run_poisson_test clean +.PHONY: run run_grid_test run_dof_test run_poisson_test run_convergence_test clean #Rule to generate the dependency file. This file is