]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Improve the Makefile that wouldn't have the dependency on the source/*.inst files...
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Sun, 9 Dec 2007 17:29:38 +0000 (17:29 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Sun, 9 Dec 2007 17:29:38 +0000 (17:29 +0000)
git-svn-id: https://svn.dealii.org/trunk@15575 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/Makefile

index 3b7189f5ba5d0e090af9dcb612b22e556d8a7f09..fe8d8b4c06b807ea427c08a42ee4c4b8bbb3afce 100644 (file)
@@ -16,6 +16,9 @@ o-files      = $(o-files-base)
 go-files     = $(o-files-base:.$(OBJEXT)=.g.$(OBJEXT))
 h-files      = $(sort $(shell echo include/lac/*.h))
 
+inst-in-files= $(shell echo source/*.inst.in)
+inst-files   = $(inst-in-files:%.in=%)
+
 # if umfpack was configured, simply link all the umfpack files into liblac.
 # these object files should have been generated before we got to the present
 # directory
@@ -40,7 +43,7 @@ $(LIBDIR)/lac/%.$(OBJEXT) :
        @echo "=====lac==============optimized==$(MT)== $(<F)"
        @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
-source/%.inst :
+source/%.inst : source/%.inst.in
        @echo "=====lac============================= $(@F)"
        @$D/common/scripts/expand_instantiations $D/common/template-arguments < $< > $@
 
@@ -121,16 +124,12 @@ clean:
 #
 # If the command fails, then remove Makefile.dep again and fail
 Makefile.dep: $(cc-files) $(h-files) \
-               $(shell echo source/*.inst.in) \
+               $(inst-files) \
                Makefile $D/common/Make.global_options
-       @echo ============================ Remaking lac/Makefile
-       @$D/common/scripts/make_dependencies $(INCLUDE) "-B$(LIBDIR)/lac" $(cc-files) \
+       @echo ===================================== Remaking lac/Makefile
+       @$D/common/scripts/make_dependencies $(INCLUDE) "-B$(LIBDIR)/lac" source/full_matrix.cc \
                > $@ \
         || (rm -f $@ ; false)
-       @for i in source/*inst.in ; do \
-               echo "$${i}.x : $${i}" | \
-               $(PERL) -pi -e 's/\.inst\.in\.x/.inst/g;' ; \
-        done >> $@
 
 
 # include all the dependencies

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.