]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Compile .cc files using their full path on the command line. This makes it simpler...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 15 Apr 2010 15:21:15 +0000 (15:21 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 15 Apr 2010 15:21:15 +0000 (15:21 +0000)
git-svn-id: https://svn.dealii.org/trunk@20992 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/Makefile
deal.II/deal.II/Makefile
deal.II/doc/news/changes.h
deal.II/lac/Makefile

index 1d4b54bede6c4bf68bb959e5a63f81fb14e0a65f..fc7a0f8060318eb43abae42577075d4bb3d724a5 100644 (file)
@@ -8,8 +8,8 @@ D=..
 
 
 # create lists of file names
-cc-files     = $(shell echo source/*.cc)
-o-files-base = $(addprefix $(LIBDIR)/base/, $(patsubst source/%,%,$(cc-files:.cc=.$(OBJEXT))))
+cc-files     = $(shell echo $D/base/source/*.cc)
+o-files-base = $(addprefix $(LIBDIR)/base/, $(patsubst $D/base/source/%,%,$(cc-files:.cc=.$(OBJEXT))))
 o-files      = $(sort $(o-files-base))
 go-files     = $(o-files:.$(OBJEXT)=.g.$(OBJEXT))
 h-files      = $(sort $(shell echo include/base/*.h))
index 787f1b98a22e947d40a74d1b7ebe9bf74bd7a5c2..1792e6b8816cb8486fce1d7abfa72da4108204d3 100644 (file)
@@ -26,8 +26,8 @@ debug: 2dg 3dg 1dg
 
 # create lists of file names. compile vectors.cc first because it is
 # one of the files that takes the longest
-cc-files     = source/numerics/vectors.cc \
-               $(filter-out source/numerics/vectors.cc, $(shell echo source/*/*.cc))
+cc-files     = $D/deal.II/source/numerics/vectors.cc \
+               $(filter-out $D/deal.II/source/numerics/vectors.cc, $(shell echo $D/deal.II/source/*/*.cc))
 h-files      = $(sort $(shell echo include/*/*.h))
 
 inst-in-files= $(shell echo source/*/*.inst.in)
@@ -36,7 +36,7 @@ inst-files   = $(inst-in-files:%.in=%)
 
 # replace subdirectories in cc file names by a prefix, preprend a "lib/[g]o"
 # and change the suffix
-tmp1        = $(shell echo $(cc-files) | $(PERL) -pi -e 's,source/,,g; s,/,_,g;')
+tmp1        = $(shell echo $(cc-files) | $(PERL) -pi -e 's,$D/deal.II/source/,,g; s,/,_,g;')
 o-files-1d  = $(addprefix $(LIBDIR)/1d/, $(tmp1:.cc=_1d.$(OBJEXT)) )
 go-files-1d = $(addprefix $(LIBDIR)/1d/, $(tmp1:.cc=_1d.g.$(OBJEXT)))
 o-files-2d  = $(addprefix $(LIBDIR)/2d/, $(tmp1:.cc=_2d.$(OBJEXT)) )
@@ -201,7 +201,8 @@ Makefile.dep: $(cc-files) $(h-files) \
                $(inst-files) \
                Makefile $D/common/Make.global_options
        @echo "===================================== Remaking deal.II/Makefile"
-       @(for dir in dofs fe grid hp multigrid numerics ; do $D/common/scripts/make_dependencies $(INCLUDE) "-B\$$(LIBDIR)" `echo source/$$dir/*cc` \
+       @(for dir in dofs fe grid hp multigrid numerics ; do \
+               $D/common/scripts/make_dependencies $(INCLUDE) "-B\$$(LIBDIR)" `echo $D/deal.II/source/$$dir/*cc` \
                | $(PERL) -p -e 's!LIBDIR\)/(.*):!LIBDIR)/DIM_PLACEHOLDER/$$1:!g;' \
                | $(PERL) -pe 's!((\.g)?.$(OBJEXT)):!_DIM_PLACEHOLDER$$1:!g;' \
                | $(PERL) -pe 's!^(.*)/DIM_PLACEHOLDER/(.*)_DIM_PLACEHOLDER(\..*):!$$1/1d/DIRPLACEHOLDER_$$2_1d$$3 $$1/2d/DIRPLACEHOLDER_$$2_2d$$3 $$1/3d/DIRPLACEHOLDER_$$2_3d$$3:!g;'\
index cac052f26e09d049be89a75314f9d83c97eb65e5..6920ed2b823a377fae5a0158f89d21cbd443d6af 100644 (file)
@@ -81,6 +81,17 @@ inconvenience this causes.
 <h3>General</h3>
 
 <ol>
+   <li>
+   <p>
+   Improved: We now compile all files with their full path name on the command
+   line. This makes it simpler for tools like debuggers or profilers (e.g.
+   valgrind) to find the source files that corresponds to an executable.
+   <br>
+   (WB 2010/04/15)
+   </p>
+   </li>
+
+
    <li>
    <p>
    Improved:
@@ -604,7 +615,7 @@ inconvenience this causes.
   <br>
   (GK 2010/03/25)
   </p></li>
-  
+
   <li>
   <p>
   New: The function DoFRenumbering::downstream has now an additional bool
index 8d1d0eeeae1806b2afd437df7f5432dca560b3ca..28817a2fe5ff1bb522aeda2b3cac140d5c983019 100644 (file)
@@ -10,8 +10,8 @@ include $D/common/Make.global_options
 
 
 # create lists of file names
-cc-files     = $(shell echo source/*.cc)
-o-files-base = $(sort $(addprefix $(LIBDIR)/lac/, $(patsubst source/%,%,$(cc-files:.cc=.$(OBJEXT)))))
+cc-files     = $(shell echo $D/lac/source/*.cc)
+o-files-base = $(sort $(addprefix $(LIBDIR)/lac/, $(patsubst $D/lac/source/%,%,$(cc-files:.cc=.$(OBJEXT)))))
 o-files      = $(o-files-base)
 go-files     = $(o-files-base:.$(OBJEXT)=.g.$(OBJEXT))
 h-files      = $(sort $(shell echo include/lac/*.h))

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.