From: wolf Date: Tue, 29 Feb 2000 13:14:08 +0000 (+0000) Subject: New directories. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56481385316918d4fd33738eddb0fbad959f6c28;p=dealii-svn.git New directories. git-svn-id: https://svn.dealii.org/trunk@2509 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index 93445d87b7..ce13455a60 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -82,11 +82,19 @@ lib/3d/o/%.o : @echo =====deal.II====3d====optimized===== $(<:source/%=%) @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=3 -c $< -o $@ -# special rules for exceptional files + +# special rules for exceptional files. they simply take too long to compile! lib/3d/o/q1_mapping.jacobians_3d.o: @echo =====deal.II====3d====opt==special== $(<:source/%=%) @$(CXX) $(filter-out -O2 -Wuninitialized,$(CXXFLAGS.o)) -Ddeal_II_dimension=3 -c $< -o $@ +ifeq ($(GXX-Version),gcc2.95) +lib/2d/o/fe_lib.quartic_2d.o: + @echo =====deal.II====2d====opt==special== $(<:source/%=%) + @$(CXX) $(filter-out -O2 -Wuninitialized,$(CXXFLAGS.o)) -Ddeal_II_dimension=2 -c $< -o $@ +endif + + # rules how to make the libraries themselves lib/libdeal_II_1d.g.a: $(go-files-1d) @@ -168,26 +176,15 @@ include $D/common/scripts/forward_declarations -################### an additional rule for the examples - -examples: - cd examples ; $(MAKE) - - - ################### some clean-up rules -clean: examples-clean lib-clean - -lib-clean: +clean: -rm -f *~ */*~ */*/*~ include/grid/forward_declarations.h* cd lib ; $(MAKE) clean -examples-clean: - cd examples ; $(MAKE) clean ################### -.PHONY: all deal.II examples TAGS -.PHONY: clean lib-clean examples-clean source-clean +.PHONY: all deal.II TAGS +.PHONY: clean lib-clean source-clean .PHONY: default 1d 2d 3d all clean diff --git a/tests/Makefile b/tests/Makefile index 6983ee73a1..a99e8e4a05 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -6,9 +6,10 @@ all: cd lac ; $(MAKE) cd fe ; $(MAKE) cd deal.II ; $(MAKE) + cd big-tests ; $(MAKE) -clean: clean-base clean-lac clean-deal.II clean-fe +clean: clean-base clean-lac clean-deal.II clean-fe clean-big clean-base: cd base ; $(MAKE) clean @@ -22,5 +23,8 @@ clean-fe: clean-deal.II: cd deal.II ; $(MAKE) clean +clean-big: + cd big-tests ; $(MAKE) clean -.PHONY: all clean clean-base clean-lac clean-fe clean-deal.II + +.PHONY: all clean clean-base clean-lac clean-fe clean-deal.II clean-big