diff options
Diffstat (limited to 'maintMakefile')
-rw-r--r-- | maintMakefile | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/maintMakefile b/maintMakefile index 9b463d9..a857897 100644 --- a/maintMakefile +++ b/maintMakefile @@ -1,5 +1,5 @@ # Maintainer-only makefile segment. This contains things that are relevant -# only if you have the full copy of the GNU make sources from the CVS +# only if you have the full copy of the GNU make sources from the Git # tree, not a dist copy. # We like mondo-warnings! @@ -83,31 +83,16 @@ DEP_FILES := $(wildcard $(DEPDIR)/*.Po) < $$f; \ done) > $@ -# Get rid of everything "else". -# -maintFILES = configure aclocal.m4 config.h.in Makefile.in stamp-h.in - -CVS-CLEAN-FILES += $(maintFILES) $(TEMPLATES) $(MTEMPLATES) NMakefile \ - build.sh.in .deps .dep_segment ABOUT-NLS \ - ansi2knr.* - -# This rule tries to clean the tree right down to how it looks when you do a -# virgin CVS checkout. +# Cleaning -# This target is potentially dangerous since it removes _ANY FILE_ that -# is not in CVS. Including files you might mean to add to CVS but -# haven't yet... I only use this in subdirectories where it's unlikely -# we have any new files. Still... be careful!! +GIT := git -cvsclean = $(PERL) -e '$$k{CVS} = 1; open(E,"< CVS/Entries") || die "CVS/Entries: $$!\n"; while (defined ($$_ = <E>)) { m%^/([^/]*)% or next; $$k{$$1} = 1; } close(E) || die "CVS/Entries: $$!\n"; opendir(D, ".") || die ".: $$!\n"; while (defined ($$_ = readdir(D))) { -f $$_ && ! exists $$k{$$_} && unlink($$_); } closedir(D) || die ".: $$!\n";' +# This rule cleans out the tree right down to how it looks when you do a +# vanilla Git checkout. It depends on correct .gitignore file content. -.PHONY: cvs-clean -cvs-clean: maintainer-clean - -rm -rf *~ $(CVS-CLEAN-FILES) - -cd config && $(cvsclean) - -cd po && $(cvsclean) - -cd doc && $(cvsclean) - -cd glob && $(cvsclean) +.PHONY: git-clean +git-clean: + -$(GIT) clean -fdX # ---------------------------------------------------------------------- @@ -201,7 +186,7 @@ update: po-update scm-update ## Sanity checks. ## ## --------------- ## -# Checks that don't require cvs. Run 'changelog-check' last as +# Checks that don't require Git. Run 'changelog-check' last as # previous test may reveal problems requiring new ChangeLog entries. local-check: po-check changelog-check |