* po/.cvsignore: List libc.pot.files, and not any .pot names.

	* manual/maint.texi (Porting): Don't mention Dist files.
	* sysdeps/alpha/soft-fp/Dist: File removed.
	* sysdeps/alpha/Dist: File removed.
	* sysdeps/i386/i686/Dist: File removed.
	* sysdeps/i386/soft-fp/Dist: File removed.
	* sysdeps/i386/Dist: File removed.
	* sysdeps/mips/soft-fp/Dist: File removed.
	* sysdeps/mips/mips64/soft-fp/Dist: File removed.
	* sysdeps/mips/mips64/Dist: File removed.
	* sysdeps/mips/Dist: File removed.
	* sysdeps/wordsize-32/Dist: File removed.
	* sysdeps/m68k/fpu/switch/Dist: File removed.
	* sysdeps/m68k/fpu/Dist: File removed.
	* sysdeps/powerpc/powerpc64/Dist: File removed.
	* sysdeps/powerpc/soft-fp/Dist: File removed.
	* sysdeps/powerpc/powerpc32/fpu/Dist: File removed.
	* sysdeps/powerpc/powerpc32/Dist: File removed.
	* sysdeps/powerpc/fpu/Dist: File removed.
	* sysdeps/powerpc/Dist: File removed.
	* sysdeps/unix/common/Dist: File removed.
	* sysdeps/unix/bsd/bsd4.4/Dist: File removed.
	* sysdeps/unix/bsd/Dist: File removed.
	* sysdeps/unix/sysv/linux/alpha/Dist: File removed.
	* sysdeps/unix/sysv/linux/i386/Dist: File removed.
	* sysdeps/unix/sysv/linux/mips/mips64/Dist: File removed.
	* sysdeps/unix/sysv/linux/mips/Dist: File removed.
	* sysdeps/unix/sysv/linux/m68k/Dist: File removed.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist: File removed.
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist: File removed.
	* sysdeps/unix/sysv/linux/powerpc/aix/Dist: File removed.
	* sysdeps/unix/sysv/linux/powerpc/Dist: File removed.
	* sysdeps/unix/sysv/linux/sparc/sparc32/Dist: File removed.
	* sysdeps/unix/sysv/linux/sparc/sparc64/Dist: File removed.
	* sysdeps/unix/sysv/linux/sparc/Dist: File removed.
	* sysdeps/unix/sysv/linux/ia64/Dist: File removed.
	* sysdeps/unix/sysv/linux/s390/s390-64/Dist: File removed.
	* sysdeps/unix/sysv/linux/s390/Dist: File removed.
	* sysdeps/unix/sysv/linux/s390/s390-32/Dist: File removed.
	* sysdeps/unix/sysv/linux/sh/Dist: File removed.
	* sysdeps/unix/sysv/linux/x86_64/Dist: File removed.
	* sysdeps/unix/sysv/linux/hppa/Dist: File removed.
	* sysdeps/unix/sysv/linux/Dist: File removed.
	* sysdeps/unix/sysv/Dist: File removed.
	* sysdeps/unix/Dist: File removed.
	* sysdeps/generic/Dist: File removed.
	* sysdeps/sparc/sparc32/soft-fp/Dist: File removed.
	* sysdeps/sparc/sparc32/sparcv9/Dist: File removed.
	* sysdeps/sparc/sparc32/sparcv8/Dist: File removed.
	* sysdeps/sparc/sparc32/Dist: File removed.
	* sysdeps/sparc/sparc64/soft-fp/Dist: File removed.
	* sysdeps/sparc/sparc64/Dist: File removed.
	* sysdeps/sparc/Dist: File removed.
	* sysdeps/gnu/Dist: File removed.
	* sysdeps/ia64/fpu/Dist: File removed.
	* sysdeps/ia64/Dist: File removed.
	* sysdeps/mach/mips/Dist: File removed.
	* sysdeps/mach/hurd/alpha/Dist: File removed.
	* sysdeps/mach/hurd/i386/Dist: File removed.
	* sysdeps/mach/hurd/mips/Dist: File removed.
	* sysdeps/mach/hurd/powerpc/Dist: File removed.
	* sysdeps/mach/hurd/Dist: File removed.
	* sysdeps/s390/s390-64/Dist: File removed.
	* sysdeps/s390/Dist: File removed.
	* sysdeps/s390/s390-32/Dist: File removed.
	* sysdeps/sh/Dist: File removed.
	* sysdeps/posix/Dist: File removed.
	* sysdeps/ieee754/dbl-64/Dist: File removed.
	* sysdeps/ieee754/ldbl-128/Dist: File removed.
	* sysdeps/ieee754/flt-32/Dist: File removed.
	* sysdeps/ieee754/Dist: File removed.
	* sysdeps/x86_64/soft-fp/Dist: File removed.
	* sysdeps/x86_64/Dist: File removed.
	* sysdeps/hppa/Dist: File removed.

	* Makerules (common-clean): Don't remove distinfo file.
	($(objpfx)distinfo): Target removed.
	* manual/Makefile (mostlyclean): Don't remove distinfo file.
	(glibc-targets): Remove echo-distinfo.

	* scripts/list-sources.sh: New file.
	* Makefile (TAGS): New target.
	* po/Makefile (libc.pot, libc.pot.files): New targets.
	* Makeconfig (XGETTEXT): New variable.
	* Makerules ($(..)po/%.pot): Rule removed.
	(TAGS): Target removed.
	* Rules (subdir_TAGS): Target removed.
	* MakeTAGS: File removed.

	* Makefile (iconvdata/% localedata/% po/% manual/%): Depend on FORCE.
	* Makeconfig ($(all-Depend-files)): New targets with no-op commands.

2 files changed, 26 insertions, 66 deletions

diff --git a/po/.cvsignore b/po/.cvsignore
index 02da896169..37752e3b33 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,65 +1,2 @@
 *.mo
-stdio-common.pot
-libc-top.pot
-csu.pot
-assert.pot
-conform.pot
-ctype.pot
-locale.pot
-intl.pot
-catgets.pot
-math.pot
-setjmp.pot
-signal.pot
-stdlib.pot
-gnulib.pot
-libio.pot
-dlfcn.pot
-malloc.pot
-string.pot
-wcsmbs.pot
-time.pot
-dirent.pot
-grp.pot
-pwd.pot
-posix.pot
-io.pot
-termios.pot
-resource.pot
-misc.pot
-socket.pot
-sysvipc.pot
-gmon.pot
-iconvdata.pot
-iconv.pot
-manual.pot
-wctype.pot
-md5-crypt.pot
-shadow.pot
-po.pot
-crypt.pot
-argp.pot
-linuxthreads_db.pot
-linuxthreads.pot
-nptl_db.pot
-nptl.pot
-libidn.pot
-soft-fp.pot
-resolv.pot
-nss.pot
-localedata.pot
-timezone.pot
-rt.pot
-debug.pot
-hesiod.pot
-inet.pot
-bare.pot
-sunrpc.pot
-nis.pot
-nscd.pot
-streams.pot
-login.pot
-elf.pot
-mach.pot
-hurd.pot
-subdirs.pot
+libc.pot.files
diff --git a/po/Makefile b/po/Makefile
index fa26aeca0c..cbbd9ab848 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc.
+# Copyright (C) 1996,1997,1998,1999,2001,2002,2006
+#	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +22,7 @@
 subdir := po
 
 # Add names of the languages with broken .po files here.
-BROKEN_LINGUAS = 
+BROKEN_LINGUAS =
 
 # List of languages for which we have message catalogs of translations.
 ALL_LINGUAS := $(filter-out $(BROKEN_LINGUAS),$(basename $(wildcard *.po)))
@@ -54,6 +55,28 @@ distribute = $(ALL_LINGUAS:=.po) $(BROKEN_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) \
 
 include ../Rules
 
+# Generate the translation template from all the source files.
+libc.pot: header.pot libc.pot.files
+	@rm -f $@.new
+	set `date -R`; disp="$$6"; \
+	sed -e 's/VERSION/$(version)/' \
+	    -e "s/DATE/`date +'%Y-%m-%d %H:%M'$$disp`/" \
+	    $< > $@.new
+	cd ..; $(XGETTEXT) --keyword=_ --keyword=N_ \
+			   --add-comments=TRANS --flag=error:3:c-format \
+			   --sort-by-file --omit-header -E -n -d - \
+			   -f po/$(word 2,$^) >> po/$@.new
+	mv -f $@.new $@
+ifeq ($(with-cvs),yes)
+	test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@
+endif
+
+# Omit tst-* files, and get only files with the given suffixes.
+libc.pot.files: FORCE
+	$(..)scripts/list-sources.sh .. | sed -n '/\/tst-/d;\
+	  $(foreach S,[ch] cxx sh bash,$(subst .,\.,/.$S\(.in\)*$$/p;))' \
+	  > $@.new
+	mv -f $@.new $@
 
 .SUFFIXES: .mo .po .pot