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:
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:
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"
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
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)
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)
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)
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 \
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 \
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
## 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
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)