From 981c817b2d185447f64b44c115bd93ff7f913db8 Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 14 Sep 2000 13:32:58 +0000 Subject: [PATCH] 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 --- deal.II/base/Makefile | 2 +- deal.II/deal.II/Makefile | 2 +- deal.II/lac/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index a9bb64cc05..4c6c766795 100644 --- 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 dc9ee1a1c0..011f8fe2a4 100644 --- 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 d2e6b1ac69..71d1640706 100644 --- 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 -- 2.39.5