]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Improve the handling of the automatically generated forward declaration files.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 24 Feb 1999 13:19:10 +0000 (13:19 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 24 Feb 1999 13:19:10 +0000 (13:19 +0000)
git-svn-id: https://svn.dealii.org/trunk@892 0785d39b-7218-0410-832d-ea1e28bc413d

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

index e355293af9946d1e757f1d008ecff1fbedc833b0..dbe68b217174d698bf86b84cf13066daef50a046 100644 (file)
@@ -4,7 +4,7 @@
 all: lac
 
 clean: source-clean
-       rm -f *~ include/*~ include/*/*~ lib/lib*
+       rm -f *~ include/*~ include/*/*~ lib/lib* include/base/forward-declarations.h*
 
 lac:
        cd source ; make
index 776d7ea425c6fa1e340548c2c032c5be4254151f..5782598795cc25c195cbfe98620681d0ca211aa9 100644 (file)
@@ -2,13 +2,17 @@
 
 D=../..
 
-include $D/deal.II/Make.global_options
-
 cc-files = $(wildcard *.cc)
 o-files  = $(cc-files:.cc=.o)
 go-files = $(cc-files:.cc=.go)
 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
+
+
 
 %.go : %.cc Makefile
        @echo ======== DEBUG =================== $<
@@ -28,10 +32,6 @@ lib.g.a: ../lib/libbase.g.a($(go-files))
 clean:
        rm -f *.o *.go *~ Makefile.dep ../lib/lib*
 
-# rule how to make the file containing all the forward declarations
-../include/base/forward-declarations.h: $(filter-out %forward-declarations.h,$(h-files))
-       @echo ============================ Generating $@
-       @perl ../../deal.II/Make_forward_declarations $(filter-out %forward-declarations.h,$(h-files)) > $@
 
 
 .PHONY: lib lib.a lib.g.a clean
@@ -46,7 +46,7 @@ clean:
 #use perl to generate rules for the .go files as well
 #as to make rules not for tria.o and the like, but
 #rather for libbasic.a(tria.o)
-../lib/Makefile.dep: $(cc-files) $(h-files)
+../lib/Makefile.dep: $(cc-files) $(filter-out $(forward-declarations),$(h-files)) Makefile
        @echo ============================ Remaking Makefile
        @perl ../Make_dep.pl ../lib/libbase $(INCLUDE) $(cc-files) \
                > ../lib/Makefile.dep
index 607304eb6fd72436358f4657a7b97abe16ba824f..5e2efb66fbc339f0600d4942f17706a920fb888b 100644 (file)
 
 D=../..
 
-include $D/deal.II/Make.global_options
-
 cc-files = $(wildcard */*.cc)
 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
+
+
+
+
 # strip subdirectories from cc file names, preprend a "../lib/[g]o"
 # and change the suffix. We place the object files with or without
 # debug info in different directories, since we want to use the
index 7c0e62d179df891d1d4db09dd61f2f4838b4e19e..693641b35e2718ea709e30f5df64b09e96d4dd73 100644 (file)
@@ -4,7 +4,7 @@
 all: lac
 
 clean: source-clean
-       rm -f *~ include/*~ include/*/*~ lib/lib* lib/Makefile.dep
+       rm -f *~ include/*~ include/*/*~ lib/lib* lib/Makefile.dep include/lac/forward-declarations.h*
 
 lac:
        cd source ; make
index af99cdae776dee4a73ccffbaa926d858ac404e36..d748ec1e00f4e68e2eacdfa3b9ef9bd693dff6f1 100644 (file)
@@ -14,6 +14,11 @@ o-files  = $(cc-files:.cc=.o)
 go-files = $(cc-files:.cc=.go)
 h-files  = $(wildcard ../include/*/*.h)
 
+forward-declarations = ../include/lac/forward-declarations.h
+
+D=../..
+include $D/deal.II/Make.forward-declarations
+
 
 %.go : %.cc Makefile
        @echo ============================ Compiling with debugging information:   $<
@@ -34,11 +39,6 @@ clean:
        rm -f *.o *.go *~ Makefile.dep ../lib/lib*
 
 
-# rule how to make the file containing all the forward declarations
-../include/lac/forward-declarations.h: $(filter-out %forward-declarations.h,$(h-files))
-       @echo ============================ Generating $@
-       @perl ../../deal.II/Make_forward_declarations $(filter-out %forward-declarations.h,$(h-files)) > $@
-
 
 
 
@@ -54,7 +54,7 @@ clean:
 #use perl to generate rules for the .go files as well
 #as to make rules not for tria.o and the like, but
 #rather for libbasic.a(tria.o)
-../lib/Makefile.dep: $(cc-files) $(h-files)
+../lib/Makefile.dep: $(cc-files) $(filter-out $(forward-declarations),$(h-files)) Makefile
        @echo ============================ Remaking Makefile
        @perl ../Make_dep.pl ../lib/liblac $(INCLUDE) $(cc-files) \
                > ../lib/Makefile.dep

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.