Sort the list of h-files. This is necessary as this determines the

order in which the forward-declarations.h file is generated and it
differed on Linux and SunOS due to the order in which
$(shell echo include/base/*.h) displayed the include files. On Linux
the order was invalid, causing compiler errors.

git-svn-id: https://svn.dealii.org/trunk@3323 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile
index a9bb64cc05c2908d40715f784fcdcf4bfe35765d..4c6c766795fd967360096edb5274b3942f3d0705 100644 (file)
--- a/deal.II/base/Makefile
+++ b/deal.II/base/Makefile
@@ -20,7 +20,7 @@ o-files-base2= $(filter-out %data_out_base.o, $(o-files-base1)) \
 o-files-base3= $(sort $(o-files-base2))
 o-files      = $(o-files-base3)
 go-files     = $(patsubst lib/o/%,lib/go/%,$(o-files-base3:.o=.go))
-h-files      = $(shell echo include/base/*.h)
+h-files      = $(sort $(shell echo include/base/*.h))
 
 forward-declarations = $D/base/include/base/forward_declarations.h
 

diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile
index dc9ee1a1c0bfb946a79c5ce99c5855441aa80a47..011f8fe2a4ac22a6b9d8055d604e581d26ee21bf 100644 (file)
--- a/deal.II/deal.II/Makefile
+++ b/deal.II/deal.II/Makefile
@@ -37,7 +37,7 @@ endif
 # files for data_out_base.cc, which is why we use the several
 # intermediate o-files-base* rules
 cc-files     = $(shell echo source/*/*.cc)
-h-files      = $(shell echo include/*/*.h)
+h-files      = $(sort $(shell echo include/*/*.h))
 
 forward-declarations = $D/deal.II/include/grid/forward_declarations.h
 

diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile
index d2e6b1ac69bd49f95f85582187635472a0e46274..71d16407065355d73616a157fcdf4202d823201f 100644 (file)
--- a/deal.II/lac/Makefile
+++ b/deal.II/lac/Makefile
@@ -15,7 +15,7 @@ o-files-base2= $(filter-out %data_out_base.o, $(o-files-base1))
 o-files-base3= $(sort $(o-files-base2))
 o-files      = $(o-files-base3)
 go-files     = $(patsubst lib/o/%,lib/go/%,$(o-files-base3:.o=.go))
-h-files      = $(shell echo include/lac/*.h)
+h-files      = $(sort $(shell echo include/lac/*.h))
 
 forward-declarations = $D/lac/include/lac/forward_declarations.h