]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Get things working, finally.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 24 Feb 1999 13:29:20 +0000 (13:29 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 24 Feb 1999 13:29:20 +0000 (13:29 +0000)
git-svn-id: https://svn.dealii.org/trunk@896 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/source/Makefile
deal.II/deal.II/source/Makefile
deal.II/lac/source/Makefile

index 5782598795cc25c195cbfe98620681d0ca211aa9..7900d0e81160d5893699b2516da9f9754c741ac3 100644 (file)
@@ -10,7 +10,6 @@ h-files  = $(wildcard ../include/*/*.h)
 forward-declarations = ../include/base/forward-declarations.h
 
 include $D/deal.II/Make.global_options
-include $D/deal.II/Make.forward-declarations
 
 
 
@@ -25,9 +24,9 @@ include $D/deal.II/Make.forward-declarations
 lib: lib.g.a lib.a
 
 
-lib.a: ../lib/libbase.a($(o-files))
+lib.a: $(forward-declarations) ../lib/libbase.a($(o-files))
 
-lib.g.a: ../lib/libbase.g.a($(go-files))
+lib.g.a: $(forward-declarations) ../lib/libbase.g.a($(go-files))
 
 clean:
        rm -f *.o *.go *~ Makefile.dep ../lib/lib*
@@ -53,3 +52,5 @@ clean:
 
 
 include ../lib/Makefile.dep
+
+include $D/deal.II/Make.forward-declarations
index 5e2efb66fbc339f0600d4942f17706a920fb888b..19f257400b69388e0e4066c09c4420643572d339 100644 (file)
@@ -18,7 +18,6 @@ h-files  = $(wildcard ../include/*/*.h)
 forward-declarations = ../include/basic/forward-declarations.h
 
 include $D/deal.II/Make.global_options
-include $D/deal.II/Make.forward-declarations
 
 
 
@@ -201,3 +200,5 @@ clean:
 
 
 include ../lib/Makefile.dep
+
+include $D/deal.II/Make.forward-declarations
index d748ec1e00f4e68e2eacdfa3b9ef9bd693dff6f1..0778e709bc4e3f7748151641802cf1ad810867a2 100644 (file)
@@ -17,7 +17,6 @@ h-files  = $(wildcard ../include/*/*.h)
 forward-declarations = ../include/lac/forward-declarations.h
 
 D=../..
-include $D/deal.II/Make.forward-declarations
 
 
 %.go : %.cc Makefile
@@ -31,9 +30,9 @@ include $D/deal.II/Make.forward-declarations
 lib: lib.g.a lib.a
 
 
-lib.a: ../lib/liblac.a($(o-files))
+lib.a: $(forward-declarations) ../lib/liblac.a($(o-files))
 
-lib.g.a: ../lib/liblac.g.a($(go-files))
+lib.g.a: $(forward-declarations) ../lib/liblac.g.a($(go-files))
 
 clean:
        rm -f *.o *.go *~ Makefile.dep ../lib/lib*
@@ -61,3 +60,5 @@ clean:
 
 
 include ../lib/Makefile.dep
+
+include $D/deal.II/Make.forward-declarations

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.