From: wolf Date: Wed, 24 Feb 1999 13:29:20 +0000 (+0000) Subject: Get things working, finally. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fba1f9c0321d0b66cca58b4a9e6675f8be28ef9;p=dealii-svn.git Get things working, finally. git-svn-id: https://svn.dealii.org/trunk@896 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/Makefile b/deal.II/base/source/Makefile index 5782598795..7900d0e811 100644 --- a/deal.II/base/source/Makefile +++ b/deal.II/base/source/Makefile @@ -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 diff --git a/deal.II/deal.II/source/Makefile b/deal.II/deal.II/source/Makefile index 5e2efb66fb..19f257400b 100644 --- a/deal.II/deal.II/source/Makefile +++ b/deal.II/deal.II/source/Makefile @@ -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 diff --git a/deal.II/lac/source/Makefile b/deal.II/lac/source/Makefile index d748ec1e00..0778e709bc 100644 --- a/deal.II/lac/source/Makefile +++ b/deal.II/lac/source/Makefile @@ -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