h-files = $(sort $(shell echo include/*/*.h))
-# 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
-# -frepo switch to gcc; this, however, creates a .rpo file which
-# would be the same for both debug and non-debug versions, if we
-# don't care about different directories
-tmp1 = $(notdir $(cc-files))
+# replace subdirectories in cc file names by a prefix, preprend a "lib/[g]o"
+# and change the suffix
+tmp1 = $(shell cd source ; echo */*cc | $(PERL) -pi -e '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)) )
# If the command fails, then remove Makefile.dep again and fail
Makefile.dep: $(cc-files) $(h-files) Makefile $D/common/Make.global_options
@echo "============================ Remaking deal.II/Makefile"
- @$D/common/scripts/make_dependencies $(INCLUDE) "-B\$$(LIBDIR)" $(cc-files) \
+ @(for dir in dofs fe grid hp multigrid numerics ; do $D/common/scripts/make_dependencies $(INCLUDE) "-B\$$(LIBDIR)" `echo 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/$$2_1d$$3 $$1/2d/$$2_2d$$3 $$1/3d/$$2_3d$$3:!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;'\
+ | $(PERL) -pe "s/DIRPLACEHOLDER/$$dir/g;" \
+ ; done ) > $@ \
|| (rm -f $@ ; false)
#include <base/config.h>
#include <grid/tria_accessor.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <vector>
#include <base/config.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_levels.h>
-#include <dofs/hp_dof_levels.h>
+#include <hp/dof_levels.h>
#include <grid/tria_iterator.h>
#include <grid/tria_iterator.templates.h>
#include <grid/tria_iterator.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <fe/fe.h>
#include <fe/fe_update_flags.h>
#include <fe/mapping.h>
#include <base/config.h>
#include <dofs/dof_levels.h>
-#include <dofs/hp_dof_objects.h>
+#include <hp/dof_objects.h>
#include <fe/fe_collection.h>
#include <vector>
#include <base/config.h>
-#include <dofs/hp_dof_objects.h>
+#include <hp/dof_objects.h>
#include <vector>
#include <base/config.h>
#include <fe/fe_collection.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <vector>
#include <dofs/dof_constraints.h>
#include <dofs/dof_tools.h>
#include <fe/fe.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q1.h>
#include <fe/mapping_collection.h>
#include <fe/q_collection.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_levels.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/tria_boundary.h>
#include <grid/tria_iterator.h>
#include <grid/tria_iterator.templates.h>
#include <grid/tria_iterator.h>
#include <grid/tria.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <dofs/dof_tools.h>
#include <fe/fe.h>
#include <base/memory_consumption.h>
-#include <dofs/hp_dof_faces.h>
+#include <hp/dof_faces.h>
DEAL_II_NAMESPACE_OPEN
#include <base/memory_consumption.h>
-#include <dofs/hp_dof_handler.h>
-#include <dofs/hp_dof_objects.h>
-#include <dofs/hp_dof_levels.h>
-#include <dofs/hp_dof_faces.h>
+#include <hp/dof_handler.h>
+#include <hp/dof_objects.h>
+#include <hp/dof_levels.h>
+#include <hp/dof_faces.h>
#include <dofs/dof_accessor.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <base/memory_consumption.h>
-#include <dofs/hp_dof_levels.h>
+#include <hp/dof_levels.h>
DEAL_II_NAMESPACE_OPEN
#include <base/memory_consumption.h>
-#include <dofs/hp_dof_levels.h>
+#include <hp/dof_levels.h>
DEAL_II_NAMESPACE_OPEN
#include <base/memory_consumption.h>
-#include <dofs/hp_dof_objects.h>
+#include <hp/dof_objects.h>
DEAL_II_NAMESPACE_OPEN
//---------------------------- hp_fe_values.cc ---------------------------
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q1.h>
DEAL_II_NAMESPACE_OPEN
#include <grid/tria.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/tria_iterator.h>
#include <fe/fe.h>
#include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q1.h>
#include <sstream>
#include <grid/tria_iterator.h>
#include <fe/fe.h>
#include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q1.h>
DEAL_II_NAMESPACE_OPEN
#include <grid/tria_iterator.h>
#include <fe/fe.h>
#include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q1.h>
#include <numerics/data_out_rotation.h>
#include <grid/tria_iterator.h>
#include <fe/fe.h>
#include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q1.h>
#include <sstream>
#include <dofs/dof_handler.h>
#include <fe/fe.h>
#include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q1.h>
#include <fe/q_collection.h>
#include <fe/fe_collection.h>
#include <dofs/dof_accessor.h>
#include <fe/fe.h>
#include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/fe_update_flags.h>
#include <fe/mapping_q1.h>
#include <fe/q_collection.h>
#include <base/quadrature.h>
#include <fe/fe.h>
#include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_collection.h>
#include <numerics/matrices.h>
#include <lac/vector.h>
//---------------------------------------------------------------------------
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include<numerics/vectors.templates.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>