From: <as...@us...> - 2003-10-22 01:15:52
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1:/tmp/cvs-serv18473/mk Modified Files: common.mk Log Message: * mk/common.mk: Avoid message about several rules for the top-level file which are .chs files. This happend since the top-level file SourceView.chs is not removed form a list containing ./SourceView.chs which is what the wild-card searching gives. Solved by stripping the ./ prefix. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- common.mk 18 Jul 2003 15:44:48 -0000 1.22 +++ common.mk 21 Oct 2003 23:32:10 -0000 1.23 @@ -44,7 +44,8 @@ # is extracted from the files themselves (and generated files don't exist # in a clean tree). CHSFILES := $(filter-out $(EXTRA_CHSFILES),\ - $(foreach DIR,$(SUBDIRSOK),$(wildcard $(DIR)*.chs))) + $(patsubst ./%,%,\ + $(foreach DIR,$(SUBDIRSOK),$(wildcard $(DIR)*.chs)))) ALLCHSFILES := $(NEEDCHI:=.chs) $(filter-out $(NEEDCHI:=.chs), \ $(CHSFILES) $(EXTRA_CHSFILES)) @@ -60,13 +61,15 @@ # HSC files HSCFILES := $(filter-out $(EXTRA_HSCFILES),\ - $(foreach DIR,$(SUBDIRSOK),$(wildcard $(DIR)*.hsc)))\ + $(patsubst ./%,%,\ + $(foreach DIR,$(SUBDIRSOK),$(wildcard $(DIR)*.hsc))))\ $(EXTRA_HSCFILES) # These are all .hs files that are not generated in any way. HSFILES := $(filter-out $(ALLCHSFILES:.chs=.hs)\ $(HSCFILES:.hsc=.hs) $(EXTRA_HSFILES),\ - $(foreach DIR,$(SUBDIRSOK),$(wildcard $(DIR)*.hs))) + $(patsubst ./%,%,\ + $(foreach DIR,$(SUBDIRSOK),$(wildcard $(DIR)*.hs)))) # These are all .hs files in the project. This is not the same as *.hs in # all subdirs because in a clean tree there is e.g. no .hs for a .chs file. @@ -265,8 +268,8 @@ # @echo Application: $(APPNAME) @echo EXTRA_CPPFLAGS: $(EXTRA_CPPFLAGS_ONLY_I) # @echo all CHS files: $(CHSFILES) -# @echo Standard header: $(STANDARD_HEADER) -# @echo Explicit header: $(EXPLICIT_HEADER) + @echo Standard header: $(STANDARD_HEADER) + @echo Explicit header: $(EXPLICIT_HEADER) # @echo all HSC files: $(HSCFILES) # @echo all other HS files: $(HSFILES) # @echo all files generating stubs: $(STUBOFILES) |