From: wolf Date: Fri, 3 Sep 1999 09:34:14 +0000 (+0000) Subject: Fix a problem with gmake 3.77 not understanding a command. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17c169c14c8fe356fd988e7d96dcd9058186fb4d;p=dealii-svn.git Fix a problem with gmake 3.77 not understanding a command. git-svn-id: https://svn.dealii.org/trunk@1720 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/Makefile b/deal.II/base/source/Makefile index 71d8e1b1e3..01a6ed8b37 100644 --- a/deal.II/base/source/Makefile +++ b/deal.II/base/source/Makefile @@ -6,7 +6,7 @@ D=../.. # create lists of file names. note that we need several output # files for data_out_base.cc, which is why we use the several # intermediate o-files-base* rules -cc-files = $(wildcard *.cc) +cc-files = $(shell echo *.cc) o-files-base1= $(addprefix ../lib/o/, $(cc-files:.cc=.o)) o-files-base2= $(filter-out %data_out_base.o, $(o-files-base1)) \ $(patsubst %.o,%_1d.o,$(filter %data_out_base.o, $(o-files-base1))) \ @@ -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 = $(wildcard ../include/*/*.h) +h-files = $(shell echo ../include/*/*.h) forward-declarations = $D/base/include/base/forward-declarations.h diff --git a/deal.II/deal.II/source/Makefile b/deal.II/deal.II/source/Makefile index 98ef5a8a19..0ef33ef457 100644 --- a/deal.II/deal.II/source/Makefile +++ b/deal.II/deal.II/source/Makefile @@ -12,8 +12,8 @@ D=../.. -cc-files = $(wildcard */*.cc) -h-files = $(wildcard ../include/*/*.h) +cc-files = $(shell echo */*.cc) +h-files = $(shell echo ../include/*/*.h) forward-declarations = $D/deal.II/include/basic/forward-declarations.h diff --git a/deal.II/doc/auto/Makefile b/deal.II/doc/auto/Makefile index 02684a4a7d..d15dc5fad5 100644 --- a/deal.II/doc/auto/Makefile +++ b/deal.II/doc/auto/Makefile @@ -7,16 +7,17 @@ # # specify which are the include files that a specific documentation libary # depends upon -kdoc.base = $(wildcard ../../base/include/base/*.h) -kdoc.lac = $(wildcard ../../lac/include/lac/*.h) -kdoc.basic = $(wildcard ../../deal.II/include/basic/*.h) -kdoc.grid = $(wildcard ../../deal.II/include/grid/tria*.h)\ - $(wildcard ../../deal.II/include/grid/grid*.h)\ - ../../deal.II/include/grid/geometry_info.h -kdoc.dof = $(wildcard ../../deal.II/include/grid/dof*.h) \ - $(wildcard ../../deal.II/include/grid/mg_*.h) \ - $(wildcard ../../deal.II/include/fe/*.h) -kdoc.numerics = $(wildcard ../../deal.II/include/numerics/*.h) +kdoc.base = $(shell echo ../../base/include/base/*.h) +kdoc.lac = $(shell echo ../../lac/include/lac/*.h) +kdoc.basic = $(shell echo ../../deal.II/include/basic/*.h) +kdoc.grid = $(shell echo ../../deal.II/include/grid/tria*.h)\ + $(shell echo ../../deal.II/include/grid/grid*.h)\ + ../../deal.II/include/grid/geometry_info.h \ + ../../deal.II/include/grid/persistent_tria.h +kdoc.dof = $(shell echo ../../deal.II/include/grid/dof*.h) \ + $(shell echo ../../deal.II/include/grid/mg_*.h) \ + $(shell echo ../../deal.II/include/fe/*.h) +kdoc.numerics = $(shell echo ../../deal.II/include/numerics/*.h) # for latex-output, we join the different libraries of the # deal.II library into just one file @@ -24,8 +25,8 @@ kdoc.dealII = $(kdoc.basic) $(kdoc.grid) $(kdoc.dof) $(kdoc.numerics) # user projects. the projects should be independant of each other, so # we need not take care of cross-dependencies each time -kdoc.transport = $(wildcard ../../projects/transport/trans_dg/*.h) -kdoc.wave-equation = $(wildcard ../../projects/wave-equation/include/*.h) +kdoc.transport = $(shell echo ../../projects/transport/trans_dg/*.h) +kdoc.wave-equation = $(shell echo ../../projects/wave-equation/include/*.h) # specify the names of the resulting doc libraries @@ -46,7 +47,8 @@ kdoc.library-files = kdoc/base.kdoc \ kdoc.library-files.rerun = $(kdoc.library-files:%.kdoc=%.kdoc.rerun) -KDOCFLAGS = -I../scripts/kdoc ../scripts/kdoc/kdoc -a -p +#KDOCFLAGS = -I../scripts/kdoc ../scripts/kdoc/kdoc -a -p +KDOCFLAGS = /home/people/wolf/tmp/kdoc-a12/bin/kdoc ifeq ($(shell uname),SunOS) DOCPP = /home/people/wolf/Config/doc++/doc++ #DOCPP = /home/people/kanschat/bin/doc++ diff --git a/deal.II/lac/source/Makefile b/deal.II/lac/source/Makefile index 32f5ee39ad..5b9d6b560d 100644 --- a/deal.II/lac/source/Makefile +++ b/deal.II/lac/source/Makefile @@ -2,10 +2,10 @@ D=../.. -cc-files = $(wildcard *.cc) +cc-files = $(shell echo *.cc) o-files = $(addprefix ../lib/o/, $(cc-files:.cc=.o)) go-files = $(addprefix ../lib/go/, $(cc-files:.cc=.go)) -h-files = $(wildcard ../include/*/*.h) +h-files = $(shell echo ../include/*/*.h) forward-declarations = $D/lac/include/lac/forward-declarations.h