From: Bruno Haible Date: Wed, 24 Oct 2018 20:08:10 +0000 (+0200) Subject: po: Make "make maintainer-clean" erase the .pot file. X-Git-Tag: v0.20~286 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=684ee38a0d5db268ea5bc42e6215138cae225408;p=thirdparty%2Fgettext.git po: Make "make maintainer-clean" erase the .pot file. Rationale: * NEWS: Mention the change. * gettext-runtime/po/Makefile.in.in (maintainer-clean): Remove the .pot file. * gettext-tools/examples/hello-*/po/Makefile.am (MAINTAINERCLEANFILES): Add the .pot file. * gettext-tools/examples/po/Makefile.am (MAINTAINERCLEANFILES): Likewise. * gettext-tools/examples/check-examples (func_check_maintainerclean, func_check_maintainerclean_vpath): Verify the .pot file is removed after 'make maintainer-clean', except when using the older Makefile.in.in infrastructure. --- diff --git a/NEWS b/NEWS index aee71951a..9de1cbd49 100644 --- a/NEWS +++ b/NEWS @@ -43,6 +43,9 @@ compliant. There is no conflict any more between these replacements and other possible replacements provided by gnulib or mingw. +* Improvements for maintainers: + - The .pot file in a 'po' directory is now erased by "make maintainer-clean". + Version 0.19.8 - June 2016 * Support for reproducible builds: diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in index 70309a9f2..77d78cd59 100644 --- a/gettext-runtime/po/Makefile.in.in +++ b/gettext-runtime/po/Makefile.in.in @@ -383,7 +383,7 @@ distclean: clean maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f stamp-po $(GMOFILES) + rm -f $(srcdir)/$(DOMAIN).pot stamp-po $(GMOFILES) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: diff --git a/gettext-tools/examples/check-examples b/gettext-tools/examples/check-examples index d29b4dd9f..406edf37e 100755 --- a/gettext-tools/examples/check-examples +++ b/gettext-tools/examples/check-examples @@ -244,9 +244,9 @@ func_check_maintainerclean () fi fi func_maintainerclean "$sample" - # TODO: Remove .pot files workaround. + # TODO: Remove .pot files workaround after next release. # TODO: Remove .po~ files workaround. - LC_ALL=C diff -r -q "$sample.bak" "$sample" | sed -n -e 's/^Only in //p' | sed -e 's|: |/|' | grep "^${sample}/" | grep -v '\.pot$' | grep -v '\.po~$' > "$sample.out" + LC_ALL=C diff -r -q "$sample.bak" "$sample" | sed -n -e 's/^Only in //p' | sed -e 's|: |/|' | grep "^${sample}/" | { if test -f "$sample"/po/Makevars || test "$sample" = hello-objc-gnustep; then grep -v '\.pot$'; else cat; fi; } | grep -v '\.po~$' > "$sample.out" func_autoclean "$sample" if ! test -s "$sample.out"; then rm -f "$sample.out" @@ -317,9 +317,9 @@ func_check_maintainerclean_vpath () fi fi func_maintainerclean "$sample" build - # TODO: Remove .pot files workaround. + # TODO: Remove .pot files workaround after next release. # TODO: Remove .po~ files workaround. - find "$sample"/build -type f | LC_ALL=C sort | grep -v '\.pot$' | grep -v '\.po~$' > "$sample.out" + find "$sample"/build -type f | LC_ALL=C sort | { if test -f "$sample"/po/Makevars; then grep -v '\.pot$'; else cat; fi; } | grep -v '\.po~$' > "$sample.out" rm -rf "$sample"/build func_autoclean "$sample" if ! test -s "$sample.out"; then diff --git a/gettext-tools/examples/hello-c++-qt/po/Makefile.am b/gettext-tools/examples/hello-c++-qt/po/Makefile.am index 038f114c1..6a73ec55c 100644 --- a/gettext-tools/examples/hello-c++-qt/po/Makefile.am +++ b/gettext-tools/examples/hello-c++-qt/po/Makefile.am @@ -262,7 +262,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(QMFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(QMFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(QMFILES) diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am index 8c4a5cc65..9725c7983 100644 --- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am +++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am @@ -327,7 +327,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am index f17f14297..06c654946 100644 --- a/gettext-tools/examples/hello-clisp/po/Makefile.am +++ b/gettext-tools/examples/hello-clisp/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am index 89a064b5e..c89ac0e7b 100644 --- a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am +++ b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am @@ -253,7 +253,7 @@ MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po -MAINTAINERCLEANFILES = stamp-po +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po maintainer-clean-local: if test -n "$(RESOURCESDLLFILES)"; then \ for file in $(RESOURCESDLLFILES); do \ diff --git a/gettext-tools/examples/hello-csharp/po/Makefile.am b/gettext-tools/examples/hello-csharp/po/Makefile.am index 89a064b5e..c89ac0e7b 100644 --- a/gettext-tools/examples/hello-csharp/po/Makefile.am +++ b/gettext-tools/examples/hello-csharp/po/Makefile.am @@ -253,7 +253,7 @@ MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po -MAINTAINERCLEANFILES = stamp-po +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po maintainer-clean-local: if test -n "$(RESOURCESDLLFILES)"; then \ for file in $(RESOURCESDLLFILES); do \ diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am index fc0a39678..239e83acc 100644 --- a/gettext-tools/examples/hello-gawk/po/Makefile.am +++ b/gettext-tools/examples/hello-gawk/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am index 1ddd76239..ab2971632 100644 --- a/gettext-tools/examples/hello-guile/po/Makefile.am +++ b/gettext-tools/examples/hello-guile/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-java-awt/po/Makefile.am b/gettext-tools/examples/hello-java-awt/po/Makefile.am index 080b897ff..d4937f181 100644 --- a/gettext-tools/examples/hello-java-awt/po/Makefile.am +++ b/gettext-tools/examples/hello-java-awt/po/Makefile.am @@ -222,7 +222,9 @@ MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po -MAINTAINERCLEANFILES = stamp-po $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) +MAINTAINERCLEANFILES = \ + $(DOMAIN).pot stamp-po \ + $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) diff --git a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am index 080b897ff..d4937f181 100644 --- a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am +++ b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am @@ -222,7 +222,9 @@ MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po -MAINTAINERCLEANFILES = stamp-po $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) +MAINTAINERCLEANFILES = \ + $(DOMAIN).pot stamp-po \ + $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) diff --git a/gettext-tools/examples/hello-java-swing/po/Makefile.am b/gettext-tools/examples/hello-java-swing/po/Makefile.am index 080b897ff..d4937f181 100644 --- a/gettext-tools/examples/hello-java-swing/po/Makefile.am +++ b/gettext-tools/examples/hello-java-swing/po/Makefile.am @@ -222,7 +222,9 @@ MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po -MAINTAINERCLEANFILES = stamp-po $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) +MAINTAINERCLEANFILES = \ + $(DOMAIN).pot stamp-po \ + $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) diff --git a/gettext-tools/examples/hello-java/po/Makefile.am b/gettext-tools/examples/hello-java/po/Makefile.am index 080b897ff..d4937f181 100644 --- a/gettext-tools/examples/hello-java/po/Makefile.am +++ b/gettext-tools/examples/hello-java/po/Makefile.am @@ -222,7 +222,9 @@ MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po -MAINTAINERCLEANFILES = stamp-po $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) +MAINTAINERCLEANFILES = \ + $(DOMAIN).pot stamp-po \ + $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am index 1f4fd862e..bceb8fc83 100644 --- a/gettext-tools/examples/hello-librep/po/Makefile.am +++ b/gettext-tools/examples/hello-librep/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am index 0d8bd466c..8d144f0f1 100644 --- a/gettext-tools/examples/hello-pascal/po/Makefile.am +++ b/gettext-tools/examples/hello-pascal/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am index 9c1948d25..857f3c4c6 100644 --- a/gettext-tools/examples/hello-perl/po/Makefile.am +++ b/gettext-tools/examples/hello-perl/po/Makefile.am @@ -331,7 +331,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am index 4c5baa62d..87cf2a53f 100644 --- a/gettext-tools/examples/hello-php/po/Makefile.am +++ b/gettext-tools/examples/hello-php/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am index 6a93f73c9..22b27e815 100644 --- a/gettext-tools/examples/hello-python/po/Makefile.am +++ b/gettext-tools/examples/hello-python/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am index d8e6c054b..b70e8d6d8 100644 --- a/gettext-tools/examples/hello-sh/po/Makefile.am +++ b/gettext-tools/examples/hello-sh/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am index 6fa217db3..51428b041 100644 --- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am +++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am index 872fb8791..7abdeb52e 100644 --- a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am +++ b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am @@ -249,7 +249,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(MSGFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(MSGFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(MSGFILES) diff --git a/gettext-tools/examples/hello-tcl/po/Makefile.am b/gettext-tools/examples/hello-tcl/po/Makefile.am index 872fb8791..7abdeb52e 100644 --- a/gettext-tools/examples/hello-tcl/po/Makefile.am +++ b/gettext-tools/examples/hello-tcl/po/Makefile.am @@ -249,7 +249,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(MSGFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(MSGFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(MSGFILES) diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am index 5bc3a70ee..270388b82 100644 --- a/gettext-tools/examples/hello-ycp/po/Makefile.am +++ b/gettext-tools/examples/hello-ycp/po/Makefile.am @@ -321,7 +321,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(GMOFILES) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am index 5291c1b0f..82d0bccd8 100644 --- a/gettext-tools/examples/po/Makefile.am +++ b/gettext-tools/examples/po/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/examples/po subdirectory of GNU gettext -## Copyright (C) 1995-1998, 2000-2007, 2009, 2016 Free Software Foundation, +## Copyright (C) 1995-1998, 2000-2007, 2009, 2014, 2018 Free Software Foundation, ## Inc. ## ## This program is free software: you can redistribute it and/or modify @@ -331,7 +331,7 @@ MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o -MAINTAINERCLEANFILES = stamp-po $(SMALLPOTS) +MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(SMALLPOTS) EXTRA_DIST = remove-potcdate.sin xsmallpot.sh mmsmallpo.sh LINGUAS \ $(POFILES)