From afcdf1a008c1eea2bd6f6ac58a40ee313e982478 Mon Sep 17 00:00:00 2001
From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 27 Oct 2010 23:25:59 +0000
Subject: [PATCH] Adjust to new directory structure.

git-svn-id: https://svn.dealii.org/trunk@22530 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/doc/development/Makefile.large | 28 ++++++++++----------------
 deal.II/doc/development/Makefile.small | 24 ++++++----------------
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/deal.II/doc/development/Makefile.large b/deal.II/doc/development/Makefile.large
index a0daa2b2bc..8fbaffd55a 100644
--- a/deal.II/doc/development/Makefile.large
+++ b/deal.II/doc/development/Makefile.large
@@ -21,7 +21,7 @@ debug-mode = on
 
 # And so does the following variable. You will have to set it to
 # something more reasonable, of course.
-clean-up-files = 
+clean-up-files =
 
 # Finally, here is a variable which tells the `run' rule which
 # parameters to pass to the executable. Usually, this will be the name
@@ -47,29 +47,23 @@ include $D/common/Make.global_options
 # are expected in `include/', while implementation files are expected
 # in `source/'. Object files are placed into `lib/[123]d', using the
 # same base name as the `.cc' file.
-cc-files    = $(shell echo source/*.cc)
-o-files     = $(cc-files:source/%.cc=lib/$(deal_II_dimension)d/%.$(OBJEXT))
-go-files    = $(cc-files:source/%.cc=lib/$(deal_II_dimension)d/%.g.$(OBJEXT))
-h-files     = $(wildcard include/*.h)
-lib-h-files = $(shell echo $D/base/include/base/*.h \
-		 $D/lac/include/lac/*.h             \
-		 $D/deal.II/include/*/*.h)
+cc-files    := $(shell echo source/*.cc)
+o-files     := $(cc-files:source/%.cc=lib/$(deal_II_dimension)d/%.$(OBJEXT))
+go-files    := $(cc-files:source/%.cc=lib/$(deal_II_dimension)d/%.g.$(OBJEXT))
+h-files     := $(wildcard include/*.h)
+lib-h-files := $(shell echo $D/include/deal.II/*/*.h)
 
-# As before, define a list of libraries. This, of course depends on
-# the dimension in which we are working:
-libs.g   = $(lib-deal2-$(deal_II_dimension)d.g) \
-	   $(lib-lac.g)                         \
-           $(lib-base.g)
-libs.o   = $(lib-deal2-$(deal_II_dimension)d.o) \
-	   $(lib-lac.o)                         \
-           $(lib-base.o)
+# As before, define two variables that denote the debug and optimized
+# versions of the deal.II libraries:
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 
 # Now use the information from above to define the set of libraries to
 # link with and the flags to be passed to the compiler:
 ifeq ($(debug-mode),on)
-  libraries = $(go-files) $(libs.g) 
+  libraries = $(go-files) $(libs.g)
   flags     = $(CXXFLAGS.g)
 else
   libraries = $(o-files) $(libs.o)
diff --git a/deal.II/doc/development/Makefile.small b/deal.II/doc/development/Makefile.small
index 757c402fea..4df6cf37f8 100644
--- a/deal.II/doc/development/Makefile.small
+++ b/deal.II/doc/development/Makefile.small
@@ -48,21 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2-2d.g) \
-	   $(lib-lac.g)      \
-           $(lib-base.g)
-libs.o   = $(lib-deal2-2d.o) \
-	   $(lib-lac.o)      \
-           $(lib-base.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -137,9 +127,7 @@ clean:
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/include/deal.II/*/*.h)
 	@echo ============================ Remaking $@
 	@$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
 		> Makefile.dep
-- 
2.39.5