about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog45
-rw-r--r--argp/Makefile4
-rw-r--r--catgets/Makefile4
-rw-r--r--conform/Makefile3
-rw-r--r--crypt/Makefile5
-rw-r--r--csu/Makefile2
-rw-r--r--debug/Makefile2
-rw-r--r--dirent/Makefile4
-rw-r--r--dlfcn/Makefile6
-rw-r--r--elf/Makefile85
-rw-r--r--gmon/Makefile3
-rw-r--r--grp/Makefile5
-rw-r--r--hesiod/Makefile10
-rw-r--r--hurd/Makefile7
-rw-r--r--iconv/Makefile4
-rw-r--r--iconvdata/Makefile79
-rw-r--r--inet/Makefile4
-rw-r--r--intl/Makefile11
-rw-r--r--io/Makefile2
-rw-r--r--libidn/ChangeLog4
-rw-r--r--libidn/Makefile4
-rw-r--r--libio/Makefile5
-rw-r--r--locale/Makefile15
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/Makefile16
-rw-r--r--login/Makefile5
-rw-r--r--mach/Makefile11
-rw-r--r--malloc/Makefile11
-rw-r--r--manual/Makefile9
-rw-r--r--math/Makefile8
-rw-r--r--misc/Makefile2
-rw-r--r--nis/Makefile7
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/Makefile2
-rw-r--r--nptl_db/ChangeLog4
-rw-r--r--nptl_db/Makefile4
-rw-r--r--nscd/Makefile6
-rw-r--r--nss/Makefile9
-rw-r--r--po/Makefile6
-rw-r--r--posix/Makefile9
-rw-r--r--resolv/Makefile2
-rw-r--r--rt/Makefile2
-rw-r--r--signal/Makefile4
-rw-r--r--socket/Makefile4
-rw-r--r--soft-fp/Makefile8
-rw-r--r--stdio-common/Makefile4
-rw-r--r--stdlib/Makefile3
-rw-r--r--string/Makefile4
-rw-r--r--sunrpc/Makefile8
-rw-r--r--time/Makefile3
-rw-r--r--timezone/Makefile9
-rw-r--r--wcsmbs/Makefile1
-rw-r--r--wctype/Makefile3
53 files changed, 107 insertions, 378 deletions
diff --git a/ChangeLog b/ChangeLog
index 4035838516..b3dbb5d63b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,50 @@
 2012-03-07  Ulrich Drepper  <drepper@gmail.com>
 
+	* login/Makefile (distribute): Remove variable.
+	* catgets/Makefile: Likewise.
+	* mach/Makefile: Likewise.
+	* malloc/Makefile: Likewise.
+	* misc/Makefile: Likewise.
+	* iconv/Makefile: Likewise.
+	* nscd/Makefile: Likewise.
+	* hurd/Makefile: Likewise.
+	* manual/Makefile: Likewise.
+	* locale/Makefile: Likewise.
+	* intl/Makefile: Likewise.
+	* conform/Makefile: Likewise.
+	* nss/Makefile: Likewise.
+	* time/Makefile: Likewise.
+	* soft-fp/Makefile: Likewise.
+	* dirent/Makefile: Likewise.
+	* gmon/Makefile: Likewise.
+	* po/Makefile: Likewise.
+	* rt/Makefile: Likewise.
+	* socket/Makefile: Likewise.
+	* math/Makefile: Likewise.
+	* signal/Makefile: Likewise.
+	* debug/Makefile: Likewise.
+	* elf/Makefile: Likewise.
+	* timezone/Makefile: Likewise.
+	* stdlib/Makefile: Likewise.
+	* iconvdata/Makefile: Likewise.
+	* sunrpc/Makefile: Likewise.
+	* io/Makefile: Likewise.
+	* argp/Makefile: Likewise.
+	* inet/Makefile: Likewise.
+	* hesiod/Makefile: Likewise.
+	* grp/Makefile: Likewise.
+	* csu/Makefile: Likewise.
+	* wctype/Makefile: Likewise.
+	* crypt/Makefile: Likewise.
+	* libio/Makefile: Likewise.
+	* string/Makefile: Likewise.
+	* nis/Makefile: Likewise.
+	* resolv/Makefile: Likewise.
+	* stdio-common/Makefile: Likewise.
+	* wcsmbs/Makefile: Likewise.
+	* dlfcn/Makefile: Likewise.
+	* posix/Makefile: Likewise.
+
 	* timezone/Makefile: Don't install timezone files, just the programs
 	and scripts.
 
diff --git a/argp/Makefile b/argp/Makefile
index 7aa6804aa2..63cea6a222 100644
--- a/argp/Makefile
+++ b/argp/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1997,2002,2003,2006,2007,2010 Free Software Foundation, Inc.
+# Copyright (C) 1997,2002,2003,2006,2007,2010,2012
+# 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,6 @@
 subdir	:= argp
 
 headers		= argp.h
-distribute	= argp-fmtstream.h argp-namefrob.h
 routines	= $(addprefix argp-, ba fmtstream fs-xinl help parse pv \
 				     pvh xinl eexst)
 
diff --git a/catgets/Makefile b/catgets/Makefile
index 9e308c50cf..a95028f2dd 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1996-2000, 2002-2004, 2012 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,8 +21,6 @@
 subdir	:= catgets
 
 headers		= nl_types.h
-distribute	= catgetsinfo.h config.h xopen-msg.sed test1.msg test2.msg \
-		  test-gencat.sh sample.SJIS
 routines	= catgets open_catalog
 others		= gencat
 install-bin	= gencat
diff --git a/conform/Makefile b/conform/Makefile
index f1f45ee201..4915a67b1e 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -20,9 +20,6 @@
 #
 subdir	:= conform
 
-distribute = conformtest.pl $(wildcard data/*.h-data) \
-	   $(wildcard data/*/*.h-data)
-
 include ../Rules
 
 ifneq (yes,$(fast-check))
diff --git a/crypt/Makefile b/crypt/Makefile
index 217588df5e..d276092215 100644
--- a/crypt/Makefile
+++ b/crypt/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 2000, 2001, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996,2000,2001,2007,2009,2012 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
@@ -30,9 +30,6 @@ libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \
 
 tests := cert md5c-test sha256c-test sha512c-test
 
-distribute := ufc-crypt.h crypt-private.h ufc.c speeds.c README.ufc-crypt \
-	      Banner md5.h sha256.h sha512.h
-
 include ../Makeconfig
 
 ifeq ($(crypt-in-libc),yes)
diff --git a/csu/Makefile b/csu/Makefile
index 8e8a41ecad..31300a49d9 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -37,8 +37,6 @@ omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \
 			     b$(start-installed-name) $(csu-dummies) \
 			     S$(start-installed-name))
 install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
-distribute = gmon-start.c start.c \
-	     abi-note.S init.c c not-cancel.h
 generated = version-info.h
 before-compile = $(objpfx)version-info.h
 
diff --git a/debug/Makefile b/debug/Makefile
index 4055211083..fb8c28572f 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -21,7 +21,6 @@
 subdir	:= debug
 
 headers	:= execinfo.h
-distribute = sigcontextinfo.h register-dump.h frame.h
 
 routines  = backtrace backtracesyms backtracesymsfd noophooks \
 	    memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \
@@ -138,7 +137,6 @@ install-bin-script = xtrace
 
 include ../Makeconfig
 
-distribute += catchsegv.sh xtrace.sh
 ifeq ($(build-shared),yes)
 install-bin-script += catchsegv
 endif
diff --git a/dirent/Makefile b/dirent/Makefile
index 8b504fdf09..0cdab68abf 100644
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1991-2000,2002,2003,2005,2006,2011 Free Software Foundation, Inc.
+# Copyright (C) 1991-2000,2002,2003,2005,2006,2011,2012
+# 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
@@ -26,7 +27,6 @@ routines	:= opendir closedir readdir readdir_r rewinddir \
 		   getdents getdents64 dirfd readdir64 readdir64_r scandir64 \
 		   alphasort64 versionsort64 fdopendir \
 		   scandirat scandirat64
-distribute := dirstream.h
 
 tests	   := list tst-seekdir opendir-tst1 bug-readdir1 tst-fdopendir \
 	      tst-fdopendir2
diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index e46744476c..1a2d2e84e6 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -22,12 +22,6 @@ libdl-routines	:= dlopen dlclose dlsym dlvsym dlerror dladdr dladdr1 dlinfo \
 		   dlmopen dlfcn
 routines	:= $(patsubst %,s%,$(filter-out dlfcn,$(libdl-routines)))
 elide-routines.os := $(routines)
-distribute	:= dlopenold.c glreflib1.c glreflib2.c glreflib3.c \
-		   failtestmod.c \
-		   defaultmod1.c defaultmod2.c errmsg1mod.c modatexit.c \
-		   modcxaatexit.c modstatic.c modstatic2.c \
-		   bug-dlsym1-lib1.c bug-dlsym1-lib2.c bug-atexit1-lib.c \
-		   bug-atexit2-lib.c
 
 extra-libs-others := libdl
 
diff --git a/elf/Makefile b/elf/Makefile
index 25ffc5765b..59a3936a1b 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -41,91 +41,6 @@ shared-only-routines += dl-caller
 rtld-routines	:= rtld $(dl-routines) dl-sysdep dl-environ dl-minimal
 all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines)
 
-distribute	:= rtld-Rules \
-		   $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
-		   dl-cache.h dl-hash.h soinit.c sofini.c ldd.bash.in \
-		   genrtldtbl.awk atomicity.h dl-procinfo.h ldsodefs.h \
-		   dl-librecon.h interp.c sln.c dl-dst.h hp-timing.h \
-		   dl-lookupcfg.h sprof.c gen-trusted-dirs.awk \
-		   testobj1.c testobj2.c testobj3.c testobj4.c testobj5.c \
-		   testobj6.c testobj1_1.c failobj.c unloadmod.c \
-		   ldconfig.h ldconfig.c cache.c readlib.c readelflib.c \
-		   chroot_canon.c gccframe.h \
-		   dep1.c dep2.c dep3.c dep4.c dl-dtprocnum.h unsecvars.h \
-		   vismain.c vismod1.c vismod2.c vismod3.c \
-		   constload2.c constload3.c filtmod1.c filtmod2.c \
-		   nodlopenmod.c nodelete.c nodelmod1.c nodelmod2.c \
-		   nodelmod3.c nodelmod4.c nodlopen.c dl-osinfo.h \
-		   reldepmod1.c reldepmod2.c reldepmod3.c reldepmod4.c \
-		   reldepmod5.c reldepmod6.c \
-		   reldep4mod1.c reldep4mod2.c reldep4mod3.c reldep4mod4.c \
-		   nextmod1.c nextmod2.c pathoptobj.c tst-pathopt.sh \
-		   neededobj1.c neededobj2.c neededobj3.c neededobj4.c \
-		   neededobj5.c neededobj6.c firstobj.c \
-		   unload2mod.c unload2dep.c ltglobmod1.c ltglobmod2.c \
-		   testobj.h vismod.h globalmod1.c \
-		   dblloadmod1.c dblloadmod2.c dblloadmod3.c \
-		   reldep6mod4.c reldep6mod3.c reldep6mod2.c reldep6mod1.c \
-		   reldep6mod0.c reldep7mod1.c reldep7mod2.c \
-		   unwind-dw2.c unwind-dw2-fde.c unwind.h unwind-pe.h \
-		   unwind-dw2-fde.h dwarf2.h dl-procinfo.c tls.h dl-tls.h \
-		   tst-tlsmod1.c tst-tlsmod2.c tst-tlsmod3.c tst-tlsmod4.c \
-		   tst-tlsmod5.c tst-tlsmod6.c tst-tlsmod7.c tst-tlsmod8.c \
-		   tst-tlsmod9.c tst-tlsmod10.c tst-tlsmod11.c \
-		   tst-tlsmod12.c tst-tls10.h tst-alignmod.c tst-alignmod2.c \
-		   circlemod1.c circlemod1a.c circlemod2.c circlemod2a.c \
-		   circlemod3.c circlemod3a.c nodlopenmod2.c \
-		   tst-tls19mod1.c tst-tls19mod2.c tst-tls19mod3.c \
-		   tls-macros.h \
-		   reldep8mod1.c reldep8mod2.c reldep8mod3.c \
-		   nodel2mod1.c nodel2mod2.c nodel2mod3.c \
-		   reldep9.c reldep9mod1.c reldep9mod2.c reldep9mod3.c \
-		   tst-array1.exp tst-array2.exp tst-array4.exp \
-		   tst-array2dep.c tst-piemod1.c \
-		   tst-execstack-mod.c tst-dlmodcount.c \
-		   check-textrel.c dl-sysdep.h test-dlopenrpathmod.c \
-		   tst-deep1mod1.c tst-deep1mod2.c tst-deep1mod3.c \
-		   unload3mod1.c unload3mod2.c unload3mod3.c unload3mod4.c \
-		   unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
-		   unload6mod1.c unload6mod2.c unload6mod3.c \
-		   unload7mod1.c unload7mod2.c \
-		   unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \
-		   tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
-		   tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
-		   tst-auditmod4a.c tst-auditmod4b.c \
-		   tst-audit5.c tst-auditmod5a.c tst-auditmod5b.c \
-		   tst-audit6.c tst-auditmod6a.c tst-auditmod6b.c \
-		   tst-auditmod6c.c \
-		   tst-audit7.c tst-auditmod7a.c tst-auditmod7b.c \
-		   order2mod1.c order2mod2.c order2mod3.c order2mod4.c \
-		   tst-stackguard1.c tst-stackguard1-static.c \
-		   tst-array5.c tst-array5-static.c tst-array5dep.c \
-		   tst-array5.exp tst-leaks1.c check-execstack.c \
-		   ifuncmain1.c ifuncmain1pic.c ifuncmain1vis.c \
-		   ifuncmain1vispic.c ifuncmain1static.c \
-		   ifuncmain1staticpic.c ifuncmain1picstatic.c \
-		   ifuncdep1.c ifuncdep1pic.c ifuncmod1.c \
-		   ifuncmain1pie.c ifuncmain1vispie.c \
-		   ifuncmain1staticpie.c \
-		   ifuncmain2.c ifuncmain2static.c ifuncdep2.c \
-		   ifuncmain2pic.c ifuncmain2picstatic.c ifuncdep2pic.c \
-		   ifuncmain3.c ifuncmod3.c \
-		   ifuncmain4.c ifuncmain4static.c ifuncmain4picstatic.c \
-		   ifuncmain5.c ifuncmain5pic.c ifuncmain5picstatic.c \
-		   ifuncmain5pie.c ifuncmain5static.c \
-		   ifuncmain5staticpic.c \
-		   ifuncdep5.c ifuncdep5pic.c ifuncmod5.c \
-		   ifuncmain6pie.c ifuncmod6.c \
-		   ifuncmain7.c ifuncmain7pic.c ifuncmain7picstatic.c \
-		   ifuncmain7pie.c ifuncmain7static.c \
-		   tst-unique1.c tst-unique1mod1.c tst-unique1mod2.c \
-		   tst-unique2.c tst-unique2mod1.c tst-unique2mod2.c \
-		   tst-initordera1.c tst-initordera2.c tst-initorderb1.c \
-		   tst-initorderb2.c tst-initordera3.c tst-initordera4.c \
-		   tst-initorder.c \
-		   tst-initorder2.c \
-		   tst-relsort1.c tst-relsort1mod1.c tst-relsort1mod2.c
-
 CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-dl-iterate-phdr.c = $(uses-callbacks)
diff --git a/gmon/Makefile b/gmon/Makefile
index 2f15d8ca3c..66c7916e1f 100644
--- a/gmon/Makefile
+++ b/gmon/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995,1996,1997,2001,2002,2005 Free Software Foundation, Inc.
+# Copyright (C) 1995-1997,2001,2002,2005,2012 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 +21,6 @@
 subdir	:= gmon
 
 headers	:= sys/gmon.h sys/gmon_out.h sys/profil.h
-distribute := machine-gmon.h profil-counter.h
 routines := gmon mcount profil sprofil bb_init_func bb_exit_func prof-freq
 
 elide-routines.os = bb_init_func bb_exit_func
diff --git a/grp/Makefile b/grp/Makefile
index f14212eed2..b5c689effa 100644
--- a/grp/Makefile
+++ b/grp/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1991,1992,1996-2000,2003,2004 Free Software Foundation, Inc.
+# Copyright (C) 1991,1992,1996-2000,2003,2004,2012
+# 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,8 +22,6 @@
 subdir	:= grp
 headers := grp.h
 
-distribute := tst_fgetgrent.c tst_fgetgrent.sh compat-initgroups.c
-
 routines := fgetgrent initgroups setgroups \
 	    getgrent getgrgid getgrnam putgrent \
 	    getgrent_r getgrgid_r getgrnam_r fgetgrent_r
diff --git a/hesiod/Makefile b/hesiod/Makefile
index 6c31a08782..b9f9b07188 100644
--- a/hesiod/Makefile
+++ b/hesiod/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 2000, 2001, 2012 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
@@ -20,8 +20,6 @@
 #
 subdir	:= hesiod
 
-distribute := hesiod.h hesiod_p.h README.hesiod nss_hesiod/nss_hesiod.h
-
 extra-libs := libnss_hesiod
 extra-libs-others = $(extra-libs)
 
@@ -29,7 +27,7 @@ subdir-dirs = nss_hesiod
 vpath %.c nss_hesiod
 
 libnss_hesiod-routines	:= hesiod hesiod-grp hesiod-init hesiod-proto \
-                           hesiod-pwd hesiod-service
+			   hesiod-pwd hesiod-service
 # Build only shared library
 libnss_hesiod-inhibit-o	= $(filter-out .os,$(object-suffixes))
 
@@ -41,6 +39,6 @@ include ../Rules
 # The Hesiod NSS modules also needs the resolver and some help from
 # the file service.
 $(objpfx)libnss_hesiod.so: $(common-objpfx)resolv/libresolv.so \
-                           $(common-objpfx)nss/libnss_files.so \
-                           $(common-objpfx)libc.so \
+			   $(common-objpfx)nss/libnss_files.so \
+			   $(common-objpfx)libc.so \
 			   $(common-objpfx)libc_nonshared.a
diff --git a/hurd/Makefile b/hurd/Makefile
index bdad4ff90b..321e04ef13 100644
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,99,2001,2002,2004,2006
+# Copyright (C) 1991,92,93,94,95,96,97,98,99,2001,2002,2004,2006,2012
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -29,7 +29,7 @@ headers = hurd.h $(interface-headers) \
 			    userlink.h resource.h threadvar.h lookup.h)
 
 inline-headers = hurd.h $(addprefix hurd/,fd.h signal.h \
-				          userlink.h threadvar.h port.h)
+					  userlink.h threadvar.h port.h)
 
 # The RPC interfaces go in a separate library.
 interface-library := libhurduser
@@ -67,12 +67,9 @@ dtable	= dtable port2fd new-fd alloc-fd intern-fd \
 	  getdport openport \
 	  fd-close fd-read fd-write hurdioctl ctty-input ctty-output
 inlines = $(inline-headers:%.h=%-inlines)
-distribute = hurdstartup.h hurdfault.h hurdhost.h \
-	     faultexc.defs intr-rpc.defs intr-rpc.h intr-msg.h Notes
 
 # XXX this is a temporary hack; see hurdmalloc.h
 routines += hurdmalloc
-distribute += hurdmalloc.h
 
 # Binary compatibility for libc.so.0.2[GLIBC_2.0].
 ifeq ($(versioning),yes)
diff --git a/iconv/Makefile b/iconv/Makefile
index 87545bf2fe..6d7791103f 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -45,10 +45,6 @@ CFLAGS-simple-hash.c = -I../locale
 
 tests	= tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5
 
-distribute	= gconv_builtin.h gconv_int.h loop.c skeleton.c iconv_prog.h \
-		  iconv_charmap.c dummy-repertoire.c gconv_charset.h strtab.c \
-		  iconvconfig.h
-
 others		= iconv_prog iconvconfig
 install-others-programs	= $(inst_bindir)/iconv
 install-sbin	= iconvconfig
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 78d5da683c..eac51ba572 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1997-2008, 2011, 2012 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
@@ -127,83 +127,6 @@ LDFLAGS-libCNS.so = $(LDFLAGS-soname-fname)
 LDFLAGS-libISOIR165.so = $(LDFLAGS-soname-fname)
 LDFLAGS-libJISX0213.so = $(LDFLAGS-soname-fname)
 
-distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
-	      gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh		    \
-	      TESTS $(wildcard testdata/*)	    \
-	      TESTS2 run-iconv-test.sh tst-tables.sh tst-table.sh	    \
-	      tst-table-charmap.sh tst-table-from.c tst-table-to.c	    \
-	      EUC-JP.irreversible ISIRI-3342.irreversible SJIS.irreversible \
-	      EUC-KR.irreversible BIG5HKSCS.irreversible BIG5.irreversible  \
-	      CP1255.irreversible CP1258.irreversible EUC-TW.irreversible   \
-	      IBM856.irreversible IBM922.irreversible IBM1132.irreversible  \
-	      IBM1133.irreversible IBM1160.irreversible IBM1161.irreversible\
-	      IBM1163.irreversible IBM1164.irreversible			    \
-	      ARMSCII-8.irreversible TCVN5712-1.precomposed		    \
-	      JISX0213.TXT EUC-JISX0213.precomposed			    \
-	      SHIFT_JISX0213.precomposed SHIFT_JISX0213.irreversible	    \
-	      TSCII.irreversible TSCII.precomposed			    \
-	      8bit-generic.c 8bit-gap.c					    \
-	      ansi_x3.110.c asmo_449.c big5.c cp737.c cp737.h		    \
-	      cp775.c cp775.h ibm874.c cns11643.c cns11643.h		    \
-	      cns11643l1.c cns11643l1.h cp1125.c cp1250.c cp1251.c cp1252.c \
-	      cp1253.c cp1254.c cp1255.c cp1256.c cp1257.c cp1258.c	    \
-	      csn_369103.c cwi.c dec-mcs.c ebcdic-at-de.c ebcdic-at-de-a.c  \
-	      ebcdic-ca-fr.c ebcdic-dk-no.c ebcdic-dk-no-a.c ebcdic-es.c    \
-	      ebcdic-es-a.c ebcdic-es-s.c ebcdic-fr.c ebcdic-fi-se.c	    \
-	      ebcdic-fi-se-a.c ebcdic-is-friss.c ebcdic-it.c ebcdic-pt.c    \
-	      ebcdic-uk.c ebcdic-us.c ecma-cyrillic.c euc-cn.c euc-jp.c	    \
-	      euc-kr.c euc-tw.c gb2312.c gb2312.h gbk.c gost_19768-74.c	    \
-	      greek-ccitt.c greek7.c greek7-old.c hp-roman8.c ibm037.c	    \
-	      ibm038.c ibm256.c ibm273.c ibm274.c ibm275.c ibm277.c	    \
-	      ibm278.c ibm280.c ibm281.c ibm284.c ibm285.c ibm290.c	    \
-	      ibm297.c ibm420.c ibm423.c ibm424.c ibm437.c ibm500.c	    \
-	      ibm850.c ibm851.c ibm852.c ibm855.c ibm857.c ibm860.c	    \
-	      ibm861.c ibm862.c ibm863.c ibm864.c ibm865.c ibm866.c	    \
-	      ibm868.c ibm869.c ibm870.c ibm871.c ibm875.c ibm880.c	    \
-	      ibm891.c ibm903.c ibm904.c ibm905.c ibm918.c ibm1004.c	    \
-	      ibm856.c ibm930.c ibm933.c ibm935.c ibm937.c ibm939.c ibm1046.c \
-	      ibm856.h ibm930.h ibm933.h ibm935.h ibm937.h ibm939.h ibm1046.h \
-	      ibm922.c ibm922.h ibm1124.c ibm1124.h ibm1129.c ibm1129.h     \
-	      ibm1132.c ibm1132.h ibm1133.c ibm1133.h ibm1162.c ibm1162.h   \
-	      ibm1026.c ibm1047.c iec_p27-1.c inis.c inis-8.c viscii.c	    \
-	      inis-cyrillic.c iso-2022-jp.c iso-2022-kr.c iso646.c	    \
-	      iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c   \
-	      iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c  \
-	      iso8859-11.c iso8859-13.c iso8859-14.c iso8859-9e.c	    \
-	      iso8859-15.c iso_2033.c iso_5427-ext.c iso_5427.c iso_5428.c  \
-	      iso_6937.c iso_6937-2.c iso_10367-box.c jis0201.c jis0201.h   \
-	      jis0208.c jis0208.h jis0212.c jis0212.h johab.c koi-8.c	    \
-	      koi8-r.c ksc5601.c ksc5601.h latin-greek.c latin-greek-1.c    \
-	      macintosh.c mac-is.c mac-uk.c nats-dano.c nats-sefi.c sjis.c  \
-	      t.61.c uhc.c sami-ws2.c iso-ir-197.c tis-620.c koi8-u.c	    \
-	      isiri-3342.c isiri-3342.h gbgbk.c iso-2022-cn.c cns11643l2.h  \
-	      iso8859-16.c utf-16.c unicode.c utf-32.c utf-7.c big5hkscs.c  \
-	      iso-ir-165.c iso-ir-165.h gb18030.c iso-2022-cn-ext.c	    \
-	      ibm932.c ibm932.h ibm943.c ibm943.h gbbig5.c cp10007.c	    \
-	      koi8-t.c georgian-ps.c georgian-academy.c iso-ir-209.c	    \
-	      mac-sami.c ibm1160.c ibm1160.h ibm1161.c ibm1161.h	    \
-	      ibm1163.c ibm1163.h ibm1164.c ibm1164.h jisx0213.c jisx0213.h \
-	      euc-jisx0213.c shift_jisx0213.c iso-2022-jp-3.c		    \
-	      tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c pt154.c rk1048.c \
-	      ibm1025.c ibm1025.h ibm1122.c ibm1122.h ibm1137.c ibm1137.h   \
-	      ibm1153.c ibm1153.h ibm1154.c ibm1154.h ibm1155.c ibm1155.h   \
-	      ibm1156.c ibm1156.h ibm1157.c ibm1157.h ibm1158.c ibm1158.h   \
-	      ibm803.c ibm803.h ibm901.c ibm901.h ibm902.c ibm902.h	    \
-	      ibm921.c ibm921.h ibm1008.c ibm1008.h ibm1008_420.c	    \
-	      ibm1097.c ibm1097.h ibm1112.c ibm1112.h ibm1123.c ibm1123.h   \
-	      ibm1130.c ibm1130.h ibm1140.c ibm1140.h ibm1141.c ibm1141.h   \
-	      ibm1142.c ibm1142.h ibm1143.c ibm1143.h ibm1144.c ibm1144.h   \
-	      ibm1145.c ibm1145.h ibm1146.c ibm1146.h ibm1147.c ibm1147.h   \
-	      ibm1148.c ibm1148.h ibm1149.c ibm1149.h ibm1166.c ibm1166.h   \
-	      ibm1167.c ibm1167.h ibm4517.c ibm4517.h ibm4899.c ibm4899.h   \
-	      ibm4909.c ibm4909.h ibm4971.c ibm4971.h ibm5347.c ibm5347.h   \
-	      ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h   \
-	      ibm12712.c ibm12712.h ibm16804.c ibm16804.h                   \
-	      ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h   \
-	      ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c   \
-	      brf.c mac-centraleurope.c hp-roman9.c hp-turkish8.c	    \
-	      hp-thai8.c hp-greek8.c cp770.c cp771.c cp772.c cp773.c cp774.c
-
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
 
diff --git a/inet/Makefile b/inet/Makefile
index 1e67cdf643..a7b8f2858d 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1991-2007, 2009, 2011, 2012 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
@@ -25,8 +25,6 @@ headers	:= netinet/ether.h netinet/in.h netinet/in_systm.h \
 	   netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \
 	   aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h
 
-distribute := netgroup.h
-
 routines := htonl htons		\
 	    inet_lnaof inet_mkadr	\
 	    inet_netof inet_ntoa inet_net herrno herrno-loc \
diff --git a/intl/Makefile b/intl/Makefile
index c9a3575329..fc6af4446a 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2003, 2005, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1995-2003,2005,2008,2011,2012 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
@@ -23,15 +23,6 @@ routines = bindtextdom dcgettext dgettext gettext	\
 	   dcigettext dcngettext dngettext ngettext \
 	   finddomain loadmsgcat localealias textdomain
 aux =	   l10nflist explodename plural plural-exp hash-string
-distribute = gmo.h gettextP.h hash-string.h loadinfo.h locale.alias \
-	     plural.y plural-exp.h plural-eval.c po2test.sed \
-	     tst-gettext.sh \
-	     tst-translit.sh translit.po \
-	     tst-gettext2.sh tstlang1.po tstlang2.po \
-	     tst-codeset.sh tstcodeset.po \
-	     tst-gettext3.sh \
-	     tst-gettext4.sh tst-gettext4-de.po tst-gettext4-fr.po \
-	     tst-gettext5.sh tst-gettext6.sh
 
 include ../Makeconfig
 
diff --git a/io/Makefile b/io/Makefile
index 1a849eca2b..6e3a737851 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -71,8 +71,6 @@ tests		:= test-utime test-stat test-stat2 test-lfs tst-getcwd \
 		   tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5 \
 		   tst-posix_fallocate
 
-distribute	:= ftwtest-sh
-
 include ../Rules
 
 CFLAGS-fcntl.c = -fexceptions -fasynchronous-unwind-tables
diff --git a/libidn/ChangeLog b/libidn/ChangeLog
index a718a9f2a3..58a95b1b93 100644
--- a/libidn/ChangeLog
+++ b/libidn/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-07  Ulrich Drepper  <drepper@gmail.com>
+
+	* Makefile (distribute): Remove variable.
+
 2011-12-03  Ulrich Drepper  <drepper@gmail.com>
 
 	* idna.c (idna_to_unicode_4z4z): Remove variable rc.
diff --git a/libidn/Makefile b/libidn/Makefile
index ecabc1b1af..8342c461ff 100644
--- a/libidn/Makefile
+++ b/libidn/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2012 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
@@ -19,8 +19,6 @@
 
 subdir	:= libidn
 
-distribute := punycode.h stringprep.h idna.h iconvme.h
-
 routines = idn-stub
 
 extra-libs		= libcidn
diff --git a/libio/Makefile b/libio/Makefile
index 206cbacebc..02efe1b3a3 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2004,2006-2009,2011 Free Software Foundation, Inc.
+# Copyright (C) 1995-2004,2006-2009,2011,2012 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
@@ -167,9 +167,6 @@ shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops	\
 		       oldiofgetpos oldiofgetpos64 oldiofsetpos		\
 		       oldiofsetpos64
 
-distribute := iolibio.h libioP.h strfile.h Banner test-freopen.sh \
-	      fd_to_filename.h
-
 include ../Rules
 
 ifeq (no,$(cross-compiling))
diff --git a/locale/Makefile b/locale/Makefile
index 5cc1e7295d..42c6772ceb 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,1992,1995-2003,2005,2009,2011
+# Copyright (C) 1991,1992,1995-2003,2005,2009,2011,2012
 # Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -22,19 +22,6 @@
 subdir	:= locale
 
 headers		= locale.h bits/locale.h langinfo.h xlocale.h
-distribute	= localeinfo.h categories.def iso-639.def iso-3166.def \
-		  iso-4217.def weight.h weightwc.h strlen-hash.h elem-hash.h \
-		  indigits.h indigitswc.h outdigits.h outdigitswc.h \
-		  coll-lookup.h C-translit.h.in C-translit.h gen-translit.pl \
-		  locarchive.h hashval.h \
-		  $(addprefix programs/, \
-			      locale.c localedef.c \
-			      $(localedef-modules:=.c) $(locale-modules:=.c) \
-			      $(lib-modules:=.c) config.h simple-hash.h \
-			      charmap-kw.gperf charmap-kw.h locfile-token.h \
-			      locfile-kw.gperf locfile-kw.h linereader.h \
-			      locfile.h charmap.h repertoire.h localedef.h \
-			      3level.h charmap-dir.h locarchive.c)
 routines	= setlocale findlocale loadlocale loadarchive \
 		  localeconv nl_langinfo nl_langinfo_l mb_cur_max \
 		  newlocale duplocale freelocale uselocale
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index ff5851fcdc..c5afba1b09 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-07  Ulrich Drepper  <drepper@gmail.com>
+
+	* Makefile (distribute): Remove variable.
+
 2012-02-10  Joseph Myers  <joseph@codesourcery.com>
 
 	Revert changes to locales from previous commit.
diff --git a/localedata/Makefile b/localedata/Makefile
index 6b48c874f1..13189607c6 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1996-2003,2005,2007,2008,2009,2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2003,2005,2007-2009,2011,2012
+# 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
@@ -56,19 +57,6 @@ generated := $(test-input) $(test-output) sort-test.out tst-locale.out \
 generated-dirs := $(ld-test-names) tt_TT de_DE.437			\
 		  $(addprefix tstfmon_,$(fmon-tests))			\
 
-distribute := CHECKSUMS README SUPPORTED ChangeLog			\
-	      $(charmaps) $(locales)					\
-	      tst-rpmatch.sh tst-locale.sh tst-fmon.sh sort-test.sh	\
-	      tst-fmon.data $(test-input-data) $(ld-test-srcs)		\
-	      th_TH.in cs_CZ.in tst-mbswcs.sh tst-trans.sh tst-ctype.sh \
-	      tst-ctype-de_DE.ISO-8859-1.in				\
-	      tst-numeric.sh tst-numeric.data				\
-	      $(wildcard tests-mbwc/*.[ch])				\
-	      $(addprefix tst-fmon-locales/tstfmon_,$(fmon-tests))	\
-	      gen-locale.sh show-ucs-data.c tst-langinfo.sh		\
-	      tst-wctype.sh tst-wctype.input gen-unicode-ctype.c	\
-	      dump-ctype.c
-
 # Get $(inst_i18ndir) defined.
 include ../Makeconfig
 
diff --git a/login/Makefile b/login/Makefile
index 305d334d8a..f28f007e6f 100644
--- a/login/Makefile
+++ b/login/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1996-1998,2000-2003,2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998,2000-2003,2007,2009,2012
+# 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
@@ -32,8 +33,6 @@ others = utmpdump pt_chown
 others-pie = pt_chown
 install-others-programs = $(inst_libexecdir)/pt_chown
 
-distribute := utmp-private.h utmp-equal.h pty-private.h
-
 subdir-dirs = programs
 vpath %.c programs
 
diff --git a/mach/Makefile b/mach/Makefile
index ec33fa72d4..00de7a505e 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,2001,02
+# Copyright (C) 1991,92,93,94,95,96,97,98,2001,02,12
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -27,7 +27,6 @@ include ../Makeconfig
 headers = mach_init.h mach.h mach_error.h mach-shortcuts.h mach/mach_traps.h \
 	  $(interface-headers) mach/mach.h mach/mig_support.h mach/error.h \
 	  $(lock-headers) machine-sp.h
-distribute = thread_state.h
 lock = spin-solid spin-lock mutex-init mutex-solid
 lock-headers = lock-intern.h machine-lock.h spin-lock.h
 routines = $(mach-syscalls) $(mach-shortcuts) \
@@ -52,17 +51,11 @@ mach/memory_object_user.defs = mach/memory_object.defs
 
 user-interfaces := $(addprefix mach/,$(mach-interface-list)	\
 			       	     mach_port mach_host exc	\
-	            )\
+		    )\
 		   $(addprefix device/,device device_request)
 
 server-interfaces := mach/exc
 
-# It is important that we do not use the wildcard function to expand
-# `err_*.sub'.  Leaving the wildcard allows Make-dist to find all matching
-# files in all sysdep directories.
-distribute += Machrules syscalls.awk shortcut.awk \
-	      errorlib.h err_*.sub errsystems.awk
-
 # Clear any environment	value.
 generated =
 
diff --git a/malloc/Makefile b/malloc/Makefile
index 17421062f3..5d6d716a78 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2011
+# Copyright (C) 1991-2003, 2005, 2006, 2007, 2009, 2011, 2012
 # Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -29,14 +29,7 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
 	 tst-mallocstate tst-mcheck tst-mallocfork tst-trim1
 test-srcs = tst-mtrace
 
-distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h memusage.h \
-	     memusage.sh memusagestat.c tst-mtrace.sh arena.c hooks.c
-
-# Things which get pasted together into gmalloc.c.
-gmalloc-routines := malloc morecore
-# Things to include in the standalone distribution.
-dist-routines = $(gmalloc-routines) mcheck mtrace
-routines = $(dist-routines) obstack
+routines = malloc morecore mcheck mtrace obstack
 
 install-lib := libmcheck.a
 non-lib.a := libmcheck.a
diff --git a/manual/Makefile b/manual/Makefile
index e291509a3a..daddd29059 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -145,17 +145,8 @@ minimal-dist = summary.awk texis.awk tsort.awk libc-texinfo.sh libc.texinfo \
 	       $(filter-out summary.texi, $(nonexamples))		    \
 	       $(patsubst %.c.texi,examples/%.c, $(examples))
 
-doc-only-dist = Makefile COPYING.LIB
-distribute = $(minimal-dist) $(examples) stdio-fp.c	\
-	     libc.info* libc.?? libc.??s texinfo.tex	\
-	     xtract-typefun.awk dir-add.texi dir libm-err-tab.pl
-export distribute := $(distribute)
-
 tar-it = tar chovf $@ $^
 
-manual.tar: $(doc-only-dist) $(minimal-dist) ; $(tar-it)
-mandist.tar: $(doc-only-dist) $(distribute) ; $(tar-it)
-
 edition := $(shell sed -n 's/^@set EDITION \([0-9][0-9.]*\)[^0-9.]*.*$$/\1/p' \
 		       libc.texinfo)
 
diff --git a/math/Makefile b/math/Makefile
index 6a6688dd0f..3a671aac71 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -26,9 +26,6 @@ headers		:= math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
 		   bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \
 		   bits/math-finite.h
 
-# Internal header files.
-distribute	:= math_ldbl.h math_private.h machine/asm.h
-
 # FPU support code.
 aux		:= setfpucw fpu_control
 
@@ -84,7 +81,6 @@ calls = s_isinf s_isnan s_finite s_copysign s_modf s_scalbn s_frexp s_ldexp \
 generated += $(foreach s,.c .S l.c l.S f.c f.S,$(calls:s_%=m_%$s))
 routines = $(calls) $(calls:=f) $(long-c-$(long-double-fcts))
 long-c-yes = $(calls:=l)
-distribute += $(filter-out $(generated),$(long-m-yes:=.c) $(long-c-yes:=.c))
 
 # Rules for the test suite.
 tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
@@ -94,7 +90,6 @@ tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
 # We do the `long double' tests only if this data type is available and
 # distinct from `double'.
 test-longdouble-yes = test-ldouble test-ildoubl
-distribute += $(test-longdouble-yes:=.c)
 
 ifneq (no,$(PERL))
 libm-tests = test-float test-double $(test-longdouble-$(long-double-fcts)) \
@@ -139,15 +134,12 @@ CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
 CPPFLAGS-test-ildoubl.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
 			  -DTEST_FAST_MATH -fno-builtin
 
-distribute += libm-test.inc gen-libm-test.pl README.libm-test
-
 
 # The -lieee module sets the _LIB_VERSION_ switch to IEEE mode
 # for error handling in the -lm functions.
 install-lib += libieee.a
 non-lib.a += libieee.a
 extra-objs += libieee.a ieee-math.o
-distribute += ieee-math.c
 
 include ../Rules
 
diff --git a/misc/Makefile b/misc/Makefile
index 169f2fd7d1..f42347ab9d 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -66,8 +66,6 @@ routines := brk sbrk sstk ioctl \
 	    listxattr lgetxattr llistxattr lremovexattr lsetxattr \
 	    removexattr setxattr
 
-distribute := device-nrs.h
-
 generated := tst-error1.mtrace tst-error1-mem
 
 include ../Makeconfig
diff --git a/nis/Makefile b/nis/Makefile
index 3a187cac68..a48753f7a9 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1996-1998,2001,2004,2006,2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998,2001,2004,2006,2011,2012
+# 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
@@ -22,10 +23,6 @@ subdir	:= nis
 
 aux			:= nis_hash
 
-distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
-			   nisplus-parser.h nis_xdr.h nss \
-			   $(wildcard rpcsvc/*.[hx])
-
 # These are the databases available for the nis (and perhaps later nisplus)
 # service.  This must be a superset of the services in nss.
 databases		= proto service hosts network grp pwd rpc ethers \
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 73394b9ed6..eb2e38daf9 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-07  Ulrich Drepper  <drepper@gmail.com>
+
+	* Makefile (distribute): Remove variable.
+
 2012-01-23  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/sem_timedwait.c (sem_timedwait): Get rid of
diff --git a/nptl/Makefile b/nptl/Makefile
index c39230d818..52277dd843 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -268,8 +268,6 @@ tests-nolibpthread = tst-unload
 # of the page size since every architecture's page size is > 1k.
 tst-oddstacklimit-ENV = ; ulimit -s 1023;
 
-distribute = eintr.c tst-cleanup4aux.c
-
 gen-as-const-headers = pthread-errnos.sym
 
 LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog
index 81ebfcdfc3..fe1778ee95 100644
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-07  Ulrich Drepper  <drepper@gmail.com>
+
+	* Makefile (distribute): Remove variable.
+
 2011-09-15  Andreas Schwab  <schwab@redhat.com>
 
 	* thread_dbP.h: Include <list.h>
diff --git a/nptl_db/Makefile b/nptl_db/Makefile
index eb3c7e89f0..d15fb9e818 100644
--- a/nptl_db/Makefile
+++ b/nptl_db/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2002,2003,2009 Free Software Foundation, Inc.
+# Copyright (C) 2002,2003,2009,2012 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
@@ -49,8 +49,6 @@ libthread_db-inhibit-o = $(filter-out .os,$(object-suffixes))
 # The ps_* callback functions are not defined.
 libthread_db.so-no-z-defs = yes
 
-distribute = thread_dbP.h shlib-versions proc_service.h \
-	     db_info.c structs.def db-symbols.h db-symbols.awk
 include ../Rules
 
 # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
diff --git a/nscd/Makefile b/nscd/Makefile
index f6965dd9c6..9503f53908 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,2000,2002-2009,2011 Free Software Foundation, Inc.
+# Copyright (C) 1998,2000,2002-2009,2011,2012 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
@@ -74,10 +74,6 @@ endif
 
 LDLIBS-nscd = $(selinux-LIBS)
 
-distribute := nscd.h nscd-client.h dbg_log.h \
-	      $(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \
-	      nscd.conf nscd.init nscd_proto.h nscd-types.h
-
 include ../Rules
 
 CFLAGS-nscd_getpw_r.c = -fexceptions
diff --git a/nss/Makefile b/nss/Makefile
index 65c094d689..13accaa01d 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-1998,2000-2002,2007,2009,2010,2011
+# Copyright (C) 1996-1998,2000-2002,2007,2009,2010,2011,2012
 # Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -22,9 +22,6 @@
 subdir	:= nss
 
 headers			:= nss.h
-distribute		:= nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \
-			   getXXent.c getXXent_r.c databases.def \
-			   nsswitch.conf digits_dots.c function.def
 
 # This is the trivial part which goes into libc itself.
 routines		= nsswitch getnssent getnssent_r digits_dots \
@@ -66,7 +63,6 @@ vpath %.c $(subdir-dirs) ../locale/programs ../intl
 
 libnss_files-routines	:= $(addprefix files-,$(databases)) \
 			   files-initgroups files-have_o_cloexec files-init
-distribute		+= files-XXX.c files-parse.c
 
 libnss_db-dbs		:= $(addprefix db-,\
 				       $(filter-out hosts network key alias,\
@@ -75,7 +71,6 @@ libnss_db-dbs		:= $(addprefix db-,\
 libnss_db-routines	:= $(libnss_db-dbs) db-open db-init hash-string
 generated		+= $(filter-out db-alias.c db-netgrp.c, \
 					$(addsuffix .c,$(libnss_db-dbs)))
-distribute		+= $(addprefix nss_db/, db-XXX.c nss_db.h)
 
 install-others		+= $(inst_vardbdir)/Makefile
 
@@ -118,8 +113,6 @@ $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
 $(inst_vardbdir)/Makefile: db-Makefile $(+force)
 	$(do-install)
 
-distribute		+= nss_test1.c
-
 CFLAGS-nss_test1.c = -DNOT_IN_libc=1
 $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(common-objpfx)libc.so \
 			   $(common-objpfx)libc_nonshared.a
diff --git a/po/Makefile b/po/Makefile
index 7f523eeb36..4ca0d1c4d1 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-1999,2001,2002,2006,2007,2009,2011
+# Copyright (C) 1996-1999,2001,2002,2006,2007,2009,2011,2012
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -47,10 +47,6 @@ mo-installed = $(inst_msgcatdir)/%/LC_MESSAGES/$(domainname).mo
 # Files to install: a $(domainname).mo file for each language.
 install-others = $(LINGUAS:%=$(mo-installed))
 
-# Files to distribute: all the source and compiled binary translation files.
-distribute = $(ALL_LINGUAS:=.po) $(BROKEN_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) \
-	     libc.pot header.pot
-
 
 include ../Rules
 
diff --git a/posix/Makefile b/posix/Makefile
index 565861f7dd..da6a325a97 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1991-2007,2009,2010,2011,2012 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
@@ -29,13 +29,6 @@ headers	:= sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h	      \
 	   bits/sched.h re_comp.h wait.h bits/environments.h cpio.h	      \
 	   sys/sysmacros.h spawn.h bits/unistd.h
 
-distribute := confstr.h TESTS TESTS2C.sed testcases.h \
-	      PTESTS PTESTS2C.sed ptestcases.h \
-	      globtest.c globtest.sh wordexp-tst.sh annexc.c fnmatch_loop.c   \
-	      spawn_int.h tst-getconf.sh regcomp.c regexec.c regex_internal.c \
-	      regex_internal.h fork.h rxspencer/tests rxspencer/COPYRIGHT     \
-	      PCRE.tests BOOST.tests
-
 routines :=								      \
 	uname								      \
 	times								      \
diff --git a/resolv/Makefile b/resolv/Makefile
index 1c7b491cf4..d87119385b 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -25,8 +25,6 @@ headers	:= resolv.h \
 	   netdb.h bits/netdb.h \
 	   arpa/nameser.h arpa/nameser_compat.h \
 	   sys/bitypes.h
-distribute := ../conf/portability.h mapv4v6addr.h mapv4v6hostent.h \
-	      Banner res_hconf.h res_debug.h README gai_misc.h ga_test.c
 
 routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \
 	    res_hconf res_libc res-state
diff --git a/rt/Makefile b/rt/Makefile
index 14a2df3903..651d007aa4 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -53,8 +53,6 @@ tests := tst-shm tst-clock tst-clock_nanosleep tst-timer tst-timer2 \
 extra-libs := librt
 extra-libs-others := $(extra-libs)
 
-distribute := aio_misc.h
-
 include ../Rules
 
 CFLAGS-aio_suspend.c = -fexceptions
diff --git a/signal/Makefile b/signal/Makefile
index 4cf886cd71..9da8599847 100644
--- a/signal/Makefile
+++ b/signal/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1998,2003,2006 Free Software Foundation, Inc.
+# Copyright (C) 1991-1998,2003,2006,2012 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
@@ -38,8 +38,6 @@ routines	:= signal raise killpg \
 
 tests		:= tst-signal tst-sigset tst-sigsimple tst-raise tst-sigset2
 
-distribute	:= sigsetops.h testrtsig.h sigset-cvt-mask.h
-
 
 include ../Rules
 
diff --git a/socket/Makefile b/socket/Makefile
index b5be39a672..e3a90b8a31 100644
--- a/socket/Makefile
+++ b/socket/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,1995-2001,2005,2008 Free Software Foundation, Inc.
+# Copyright (C) 1991,1995-2001,2005,2008,2012 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
@@ -30,6 +30,4 @@ routines := accept bind connect getpeername getsockname getsockopt	\
 
 aux	 := have_sock_cloexec
 
-distribute := ifreq.h
-
 include ../Rules
diff --git a/soft-fp/Makefile b/soft-fp/Makefile
index 11464dfac4..88ee6c5cb3 100644
--- a/soft-fp/Makefile
+++ b/soft-fp/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 1999, 2000  Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2012  Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 
@@ -35,10 +35,4 @@ gcc-quad-routines := negtf2 addtf3 subtf3 multf3 divtf3 eqtf2 \
 	fixunstfdi floatditf extendsftf2 trunctfsf2 extenddftf2 \
 	trunctfdf2 sqrttf2 floatunsitf floatunditf
 
-distribute := double.h op-1.h op-2.h op-4.h op-common.h quad.h \
-	single.h soft-fp.h extended.h Banner op-8.h testit.c \
-	$(addsuffix .c,$(gcc-single-routines)) \
-	$(addsuffix .c,$(gcc-double-routines)) \
-	$(addsuffix .c,$(gcc-quad-routines))
-
 include ../Rules
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 831fafefb9..c8a136539a 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1991-2009, 2011, 2012 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
@@ -44,8 +44,6 @@ install-others = $(inst_includedir)/bits/stdio_lim.h
 include ../Makeconfig
 
 aux	:= errlist siglist printf-parsemb printf-parsewc fxprintf
-distribute := _itoa.h _itowa.h _i18n_number.h \
-	      printf-parse.h stdio_lim.h.in tst-unbputc.sh tst-printf.sh
 
 tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
 	 temptest tst-fileno test-fwrite tst-ungetc tst-ferror \
diff --git a/stdlib/Makefile b/stdlib/Makefile
index efdf8731da..44eb20d681 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -59,8 +59,6 @@ aux =	grouping groupingwc tens_in_limb
 # linked against when the shared library will be used.
 static-only-routines = atexit at_quick_exit
 
-distribute	:= exit.h grouping.h abort-instr.h isomac.c tst-fmtmsg.sh   \
-		   allocalim.h
 test-srcs	:= tst-fmtmsg
 tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
 		   test-canon test-canon2 tst-strtoll tst-environ	    \
@@ -87,7 +85,6 @@ routines := $(strip $(routines) $(mpn-routines))	\
 	    dbl2mpn ldbl2mpn				\
 	    mpn2flt mpn2dbl mpn2ldbl
 aux += fpioconst mp_clz_tab
-distribute := $(distribute) $(mpn-headers) fpioconst.h tst-putenvmod.c
 
 tests-extras += tst-putenvmod
 extra-test-objs += tst-putenvmod.os
diff --git a/string/Makefile b/string/Makefile
index a402602099..0e42d31dee 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002, 2005-2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002, 2005-2011, 2012 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
@@ -57,8 +57,6 @@ tests		:= tester inl-tester noinl-tester testcopy test-ffs	\
 		   bug-strtok1 $(addprefix test-,$(strop-tests))	\
 		   bug-envz1 tst-strxfrm2 tst-endian tst-svc2		\
 		   bug-strstr1 bug-strchr1
-distribute	:= memcopy.h pagecopy.h tst-svc.expect test-string.h	\
-		   str-two-way.h
 
 
 include ../Rules
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index b7f63a50b2..329d3f3d35 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994-2004, 2005, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1994-2006, 2011, 2012 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
@@ -85,11 +85,6 @@ install-bin := rpcgen
 rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \
 	      rpc_scan.o rpc_util.o rpc_svcout.o rpc_clntout.o \
 	      rpc_tblout.o rpc_sample.o
-# These headers are part of rpcgen.
-distribute := proto.h rpc_util.h rpc_parse.h rpc_scan.h \
-	      $(headers-in-tirpc) $(headers-not-in-tirpc) \
-	      $(rpcgen-objs:.o=.c) etc.rpc \
-	      errqueue.h
 extra-objs = $(rpcgen-objs)
 
 all: # Make this the default target; it will be defined in Rules.
@@ -100,7 +95,6 @@ xtests := tst-getmyaddr
 ifeq ($(have-thread-library),yes)
 xtests += thrsvc
 endif
-distribute += thrsvc.c
 
 ifeq (yes,$(build-static-nss))
 otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
diff --git a/time/Makefile b/time/Makefile
index 49ea729e35..ffa3e881ef 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2003, 2004, 2005, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1991-2005,2007,2011,2012 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
@@ -31,7 +31,6 @@ routines := offtime asctime clock ctime ctime_r difftime \
 	    strftime wcsftime strftime_l wcsftime_l	 \
 	    timespec_get
 aux :=	    era alt_digit lc-time-cleanup
-distribute := datemsk
 
 tests	:= test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
 	   tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
diff --git a/timezone/Makefile b/timezone/Makefile
index d5ea538991..00bfba6e23 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -20,23 +20,18 @@
 #
 subdir	:= timezone
 
-distribute := tzfile.h private.h scheck.c ialloc.c yearistype	\
-	      iso3166.tab zone.tab tzselect.ksh checktab.awk	\
-	      README
-
 extra-objs := scheck.o ialloc.o
 
 others	:= zdump zic
 tests	:= test-tz tst-timezone
 
+# pacificnew doesn't compile; if it is to be used, it should be included in
+# northamerica.
 tzbases := africa antarctica asia australasia europe northamerica \
 	   southamerica etcetera factory \
 	   solar87 solar88 solar89
 tzlinks := backward systemv
 tzfiles := $(tzbases) $(tzlinks)
-# pacificnew doesn't compile; if it is to be used, it should be included in
-# northamerica.
-distribute += $(tzfiles) leapseconds pacificnew simplebackw
 
 generated := $(addprefix z.,$(tzfiles))
 install-sbin := zic zdump
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 46d4c5f478..fc67be8f82 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -22,7 +22,6 @@
 subdir	:= wcsmbs
 
 headers	:= wchar.h bits/wchar.h bits/wchar2.h bits/wchar-ldbl.h uchar.h
-distribute := wcwidth.h wcsmbsload.h
 
 routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \
 	    wcsncmp wcsncpy wcspbrk wcsrchr wcsspn wcstok wcsstr wmemchr \
diff --git a/wctype/Makefile b/wctype/Makefile
index e54e6efe56..6a06f001fe 100644
--- a/wctype/Makefile
+++ b/wctype/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 1997, 1999, 2000, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996,1997,1999,2000,2008,2012 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 +21,6 @@
 subdir	:= wctype
 
 headers		:= wctype.h
-distribute	:= wchar-lookup.h
 routines	:= wcfuncs wctype iswctype wctrans towctrans \
 		   wcfuncs_l wctype_l iswctype_l wctrans_l towctrans_l