Provide a stub implementation for priv_set_to_str
[kopensolaris-gnu/glibc.git] / Makefile
index 813ffc4..43c4f4d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002,2003,2004,2005,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
-# modify it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 
 # The GNU C Library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# Lesser General Public License for more details.
 
-# You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
 
 #
 #      Master Makefile for the GNU C library
@@ -23,79 +23,53 @@ ifneq (,)
 This makefile requires GNU Make.
 endif
 
+include Makeconfig
+
 
 # This is the default target; it makes everything except the tests.
 .PHONY: all
 all: lib others
 \f
+ifneq ($(AUTOCONF),no)
+
 ifeq ($(with-cvs),yes)
-define autoconf-it
-@-rm -f $@.new
-autoconf $(ACFLAGS) $< > $@.new
-chmod a-w,a+x $@.new
-mv -f $@.new $@
+define autoconf-it-cvs
 test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
 endef
 else
+autoconf-it-cvs =
+endif
+
 define autoconf-it
 @-rm -f $@.new
-autoconf $(ACFLAGS) $< > $@.new
+$(AUTOCONF) $(ACFLAGS) $< > $@.new
 chmod a-w,a+x $@.new
 mv -f $@.new $@
+$(autoconf-it-cvs)
 endef
-endif
 
 configure: configure.in aclocal.m4; $(autoconf-it)
 %/configure: %/configure.in aclocal.m4; $(autoconf-it)
+%/preconfigure: %/preconfigure.in aclocal.m4; $(autoconf-it)
 
-include Makeconfig
-
-ifndef avoid-generated
--include $(objpfx)sysd-dirs
-define \n
-
-
-endef
-sysdep-subdirs := $(subst $(\n), ,$(sysdep-subdirs))
-endif
+endif # $(AUTOCONF) = no
 
-# These are the subdirectories containing the library source.
-subdirs = csu assert ctype db2 locale intl catgets math setjmp signal stdlib \
-         stdio-common $(stdio) malloc string wcsmbs time dirent grp pwd \
-         posix io termios resource misc socket sysvipc gmon gnulib iconv \
-         iconvdata wctype manual shadow md5-crypt po argp $(add-ons) nss \
-         localedata timezone rt $(sysdep-subdirs) $(binfmt-subdir)
-export subdirs := $(subdirs)   # Benign, useless in GNU make before 3.63.
-
-# The mach and hurd subdirectories have many generated header files which
-# much of the rest of the library depends on, so it is best to build them
-# first (and mach before hurd, at that).  The before-compile additions in
-# sysdeps/{mach,hurd}/Makefile should make it reliably work for these files
-# not to exist when making in other directories, but it will be slower that
-# way with more somewhat expensive `make' invocations.
-subdirs        := $(filter mach,$(subdirs)) $(filter hurd,$(subdirs)) \
-          $(filter-out mach hurd,$(subdirs))
-
-# All initialization source files.
-+subdir_inits  := $(wildcard $(foreach dir,$(subdirs),$(dir)/init-$(dir).c))
-# All subdirectories containing initialization source files.
-+init_subdirs  := $(patsubst %/,%,$(dir $(+subdir_inits)))
 
+# We don't want to run anything here in parallel.
+.NOTPARALLEL:
 
 # These are the targets that are made by making them in each subdirectory.
 +subdir_targets        := subdir_lib objects objs others subdir_mostlyclean    \
                   subdir_clean subdir_distclean subdir_realclean       \
-                  tests subdir_lint.out                                \
-                  subdir_distinfo                                      \
-                  subdir_echo-headers subdir_echo-distinfo             \
+                  tests xtests subdir_lint.out                         \
+                  subdir_update-abi subdir_check-abi                   \
+                  subdir_echo-headers                                  \
                   subdir_install                                       \
+                  subdir_objs subdir_stubs subdir_testclean            \
                   $(addprefix install-, no-libc.a bin lib data headers others)
 \f
-headers := errno.h sys/errno.h bits/errno.h limits.h values.h  \
-          features.h gnu-versions.h bits/libc-lock.h bits/xopen_lim.h  \
-          gnu/libc-version.h
-aux     = sysdep $(libc-init) version
-before-compile += $(objpfx)version-info.h
+headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \
+          bits/xopen_lim.h gnu/libc-version.h
 
 echo-headers: subdir_echo-headers
 
@@ -105,28 +79,24 @@ vpath %.h $(subdir-dirs)
 
 # What to install.
 install-others = $(inst_includedir)/gnu/stubs.h
-install-bin = glibcbug
+install-bin-script =
 
 ifeq (yes,$(build-shared))
-install-others += $(inst_includedir)/gnu/lib-names.h
+headers += gnu/lib-names.h
 endif
 
-ifeq (yes,$(gnu-ld))
-libc-init = set-init
-else
-libc-init = munch-init
-$(objpfx)munch-init.c: munch.awk munch-tmpl.c $(+subdir_inits)
-       awk -f $< subdirs='$(+init_subdirs)' $(word 2,$^) > $@-t
-       mv -f $@-t $@
-generated := $(generated) munch-init.c
-endif
-
-
 include Makerules
 
+ifeq ($(build-programs),yes)
+others: $(addprefix $(objpfx),$(install-bin-script))
+endif
+
 # Install from subdirectories too.
 install: subdir_install
 
+# Explicit dependency so that `make install-headers' works
+install-headers: install-headers-nosubdir
+
 # Make sure that the dynamic linker is installed before libc.
 $(inst_slibdir)/libc-$(version).so: elf/ldso_install
 
@@ -134,17 +104,24 @@ $(inst_slibdir)/libc-$(version).so: elf/ldso_install
 elf/ldso_install:
        $(MAKE) -C $(@D) $(@F)
 
-# Create links for shared libraries using the `ldconfig' program is possible.
+# Create links for shared libraries using the `ldconfig' program if possible.
 # Ignore the error if we cannot update /etc/ld.so.cache.
 ifeq (no,$(cross-compiling))
 ifeq (yes,$(build-shared))
+install: install-symbolic-link
+.PHONY: install-symbolic-link
+install-symbolic-link: subdir_install
+       $(symbolic-link-prog) $(symbolic-link-list)
+       rm -f $(symbolic-link-list)
+
 install:
-       -test ! -x $(common-objpfx)elf/ldconfig || \
-         $(common-objpfx)elf/ldconfig -d $(inst_slibdir) $(inst_libdir)
+       -test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
+         $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
+                                      $(slibdir) $(libdir)
 ifneq (no,$(PERL))
 ifeq (/usr,$(prefix))
 ifeq (,$(install_root))
-       CC="$(CC)" $(PERL) test-installation.pl $(common-objpfx)
+       CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
 endif
 endif
 endif
@@ -159,47 +136,40 @@ ifeq (yes,$(build-shared))
 lib: $(common-objpfx)libc.so
 endif
 
-all-Subdirs-files = $(wildcard $(addsuffix /Subdirs, $(config-sysdirs)))
-$(objpfx)sysd-dirs: $(+sysdir_pfx)config.make $(all-Subdirs-files)
-       (echo define sysdep-subdirs;                            \
-        sed 's/#.*$$//' $(all-Subdirs-files) /dev/null;        \
-        echo endef) > $@-tmp
-       mv -f $@-tmp $@
-\f
-all-Banner-files = $(wildcard $(addsuffix /Banner, $(subdirs)))
-$(objpfx)version-info.h: $(+sysdir_pfx)config.make $(all-Banner-files)
-       (case $(config-os) in \
-          linux*) version=`(echo -e "#include <linux/version.h>\nUTS_RELEASE"\
-                            | $(CC) -E -P - | \
-                            sed -e 's/"\([^"]*\)".*/\1/p' -e d) 2>/dev/null`;\
-                  if [ -z "$$version" ]; then \
-                    if [ -r /proc/version ]; then \
-                      version=`sed 's/.*version \([^ ]*\) .*/>>\1<</' \
-                               < /proc/version`; \
-                    else \
-                      version=`uname -r`; \
-                    fi; \
-                  fi; \
-                  echo -n "\"Compiled on a Linux $$version system "; \
-                  echo "on `date +%Y-%m-%d`.\\n\"" ;; \
-          *) ;; \
-        esac; \
-        files="$(all-Banner-files)";                           \
-        if test -n "$$files"; then                             \
-          echo "\"Available extensions:";                      \
-          sed -e '/^#/d' -e 's/^[[:space:]]*/  /' $$files;     \
-          echo "\"";                                           \
-        fi) > $@T
+
+# This is a handy script for running any dynamically linked program against
+# the current libc build for testing.
+$(common-objpfx)testrun.sh: $(common-objpfx)config.make \
+                           $(..)Makeconfig $(..)Makefile
+       (echo '#!/bin/sh'; \
+        echo "GCONV_PATH='$(common-objpfx)iconvdata' \\"; \
+        echo 'exec $(run-program-prefix) $${1+"$$@"}'; \
+       ) > $@T
+       chmod a+x $@T
        mv -f $@T $@
+postclean-generated += testrun.sh
 
-version.c-objects := $(addprefix $(objpfx)version,$(object-suffixes))
-$(version.c-objects): $(objpfx)version-info.h
+others: $(common-objpfx)testrun.sh
 \f
-# Makerules creates a file `stub-$(subdir)' for each subdirectory, which
-# contains `#define __stub_FUNCTION' for each function which is a stub.
+# Makerules creates a file `stubs' in each subdirectory, which
+# contains `#define __stub_FUNCTION' for each function defined in that
+# directory which is a stub.
 # Here we paste all of these together into <gnu/stubs.h>.
 
-subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)stub-$(dir))
+subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs)
+
+ifeq ($(biarch),no)
+installed-stubs = $(inst_includedir)/gnu/stubs.h
+else
+installed-stubs = $(inst_includedir)/gnu/stubs-$(biarch).h
+
+$(inst_includedir)/gnu/stubs.h: include/stubs-biarch.h $(+force)
+       $(make-target-directory)
+       $(INSTALL_DATA) $< $@
+
+install-others-nosubdir: $(installed-stubs)
+endif
+
 
 # Since stubs.h is never needed when building the library, we simplify the
 # hairy installation process by producing it in place only as the last part
@@ -207,36 +177,18 @@ subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)stub-$(dir))
 # iterates over all the subdirs; subdir_install in each subdir depends on
 # the subdir's stubs file.  Having more direct dependencies would result in
 # extra iterations over the list for subdirs and many recursive makes.
-$(inst_includedir)/gnu/stubs.h: subdir_install
+$(installed-stubs): include/stubs-prologue.h subdir_install
        $(make-target-directory)
        @rm -f $(objpfx)stubs.h
-       (echo '/* This file is automatically generated.';\
-        echo '   It defines a symbol `__stub_FUNCTION'\'' for each function';\
-        echo '   in the C library which is a stub, meaning it will fail';\
-        echo '   every time called, usually setting errno to ENOSYS.  */';\
-        sort $(subdir-stubs)) > $(objpfx)stubs.h
+       (sed '/^@/d' $<; LC_ALL=C sort $(subdir-stubs)) > $(objpfx)stubs.h
        if test -r $@ && cmp -s $(objpfx)stubs.h $@; \
        then echo 'stubs.h unchanged'; \
        else $(INSTALL_DATA) $(objpfx)stubs.h $@; fi
        rm -f $(objpfx)stubs.h
 \f
-ifeq (yes,$(build-shared))
-
-$(inst_includedir)/gnu/lib-names.h: $(common-objpfx)gnu/lib-names.h
-       $(make-target-directory)
-       if test -r $@ && cmp -s $< $@; \
-       then echo 'gnu/lib-names.h unchanged'; \
-       else $(INSTALL_DATA) $< $@; fi
-endif
-\f
-# The `glibcbug' script contains the version number and it shall be rebuild
-# whenever this changes or the `glibcbug.in' file.
-$(objpfx)glibcbug: $(common-objpfx)config.status glibcbug.in
-       cd $(<D); CONFIG_FILES=$(@F) CONFIG_HEADERS= $(SHELL) $(<F)
-\f
 # This makes the Info or DVI file of the documentation from the Texinfo source.
-.PHONY: info dvi
-info dvi:
+.PHONY: info dvi pdf html
+info dvi pdf html:
        $(MAKE) $(PARALLELMFLAGS) -C manual $@
 \f
 # This makes all the subdirectory targets.
@@ -251,23 +203,31 @@ all-subdirs-targets := $(foreach dir,$(subdirs),\
 # The action for each of those is to cd into the directory and make the
 # target there.
 $(all-subdirs-targets):
-       $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
+       $(MAKE) $(PARALLELMFLAGS) $(subdir-target-args) $(@F)
+
+define subdir-target-args
+subdir=$(@D)$(if $($(@D)-srcdir),\
+-C $($(@D)-srcdir) ..=`pwd`/,\
+-C $(@D) ..=../)
+endef
 
 .PHONY: $(+subdir_targets) $(all-subdirs-targets)
 \f
 # Targets to clean things up to various degrees.
 
-.PHONY: clean realclean distclean distclean-1 parent-clean parent-mostlyclean
+.PHONY: clean realclean distclean distclean-1 parent-clean parent-mostlyclean \
+       tests-clean
 
 # Subroutines of all cleaning targets.
 parent-mostlyclean: common-mostlyclean # common-mostlyclean is in Makerules.
-       -rm -f $(foreach o,$(object-suffixes),\
+       -rm -f $(foreach o,$(object-suffixes-for-libc),\
                   $(common-objpfx)$(patsubst %,$(libtype$o),c)) \
               $(addprefix $(objpfx),$(install-lib))
 parent-clean: parent-mostlyclean common-clean
 
 postclean = $(addprefix $(common-objpfx),$(postclean-generated)) \
-           $(addprefix $(objpfx),sysd-Makefile sysd-dirs sysd-rules)
+           $(addprefix $(objpfx),sysd-dirs sysd-rules) \
+           $(addprefix $(objpfx),sysd-sorted soversions.mk soversions.i)
 
 clean: parent-clean
 # This is done this way rather than having `subdir_clean' be a
@@ -275,10 +235,82 @@ clean: parent-clean
 # subdirectories are dealt with and so they won't try to remove object
 # files from it when it's going to be removed anyway.
        @$(MAKE) subdir_clean no_deps=t
+       -rm -f $(postclean)
 mostlyclean: parent-mostlyclean
        @$(MAKE) subdir_mostlyclean no_deps=t
        -rm -f $(postclean)
 
+tests-clean:
+       @$(MAKE) subdir_testclean no_deps=t
+
+tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
+ifneq ($(CXX),no)
+check-data := $(firstword $(wildcard \
+               $(foreach M,$(config-machine) $(base-machine),\
+                         scripts/data/c++-types-$M-$(config-os).data)))
+ifneq (,$(check-data))
+$(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh
+       scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@
+else
+$(objpfx)c++-types-check.out:
+       @echo 'WARNING C++ tests not run; create a c++-types-XXX file'
+       @echo "not run" > $@
+endif
+endif
+
+$(objpfx)check-local-headers.out: scripts/check-local-headers.sh
+       scripts/check-local-headers.sh "$(includedir)" "$(objpfx)" > $@
+
+ifneq ($(PERL),no)
+installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \
+                   crypt/crypt.h ctype/ctype.h debug/execinfo.h \
+                   dirent/dirent.h dlfcn/dlfcn.h elf/elf.h elf/link.h \
+                   gmon/sys/gmon.h gmon/sys/gmon_out.h gmon/sys/profil.h \
+                   grp/grp.h iconv/iconv.h iconv/gconv.h \
+                   $(wildcard inet/netinet/*.h) \
+                   $(wildcard inet/arpa/*.h inet/protocols/*.h) \
+                   inet/aliases.h inet/ifaddrs.h inet/netinet/ip6.h \
+                   inet/netinet/icmp6.h intl/libintl.h io/sys/stat.h \
+                   io/sys/statfs.h io/sys/vfs.h io/sys/statvfs.h \
+                   io/fcntl.h io/sys/fcntl.h io/poll.h io/sys/poll.h \
+                   io/utime.h io/ftw.h io/fts.h io/sys/sendfile.h \
+                   libio/stdio.h libio/libio.h locale/locale.h \
+                   locale/langinfo.h locale/xlocale.h login/utmp.h \
+                   login/lastlog.h login/pty.h malloc/malloc.h \
+                   malloc/obstack.h malloc/mcheck.h math/math.h \
+                   math/complex.h math/fenv.h math/tgmath.h misc/sys/uio.h \
+                   $(wildcard nis/rpcsvc/*.h) nptl_db/thread_db.h \
+                   nptl/sysdeps/pthread/pthread.h nptl/semaphore.h \
+                   nss/nss.h posix/sys/utsname.h posix/sys/times.h \
+                   posix/sys/wait.h posix/sys/types.h posix/unistd.h \
+                   posix/glob.h posix/regex.h posix/wordexp.h posix/fnmatch.h\
+                   posix/getopt.h posix/tar.h posix/sys/unistd.h \
+                   posix/sched.h posix/re_comp.h posix/wait.h \
+                   posix/cpio.h posix/spawn.h pwd/pwd.h resolv/resolv.h \
+                   resolv/netdb.h $(wildcard resolv/arpa/*.h) \
+                   resource/sys/resource.h resource/sys/vlimit.h \
+                   resource/sys/vtimes.h resource/ulimit.h rt/aio.h \
+                   rt/mqueue.h setjmp/setjmp.h shadow/shadow.h \
+                   signal/signal.h signal/sys/signal.h socket/sys/socket.h \
+                   socket/sys/un.h stdio-common/printf.h \
+                   stdio-common/stdio_ext.h stdlib/stdlib.h stdlib/alloca.h \
+                   stdlib/monetary.h stdlib/fmtmsg.h stdlib/ucontext.h \
+                   sysdeps/generic/inttypes.h sysdeps/generic/stdint.h \
+                   stdlib/errno.h stdlib/sys/errno.h string/string.h \
+                   string/strings.h string/memory.h string/endian.h \
+                   string/argz.h string/envz.h string/byteswap.h \
+                   $(wildcard sunrpc/rpc/*.h sunrpc/rpcsvc/*.h) \
+                   sysvipc/sys/ipc.h sysvipc/sys/msg.h sysvipc/sys/sem.h \
+                   sysvipc/sys/shm.h termios/termios.h \
+                   termios/sys/termios.h termios/sys/ttychars.h time/time.h \
+                   time/sys/time.h time/sys/timeb.h wcsmbs/wchar.h \
+                   wctype/wctype.h
+
+tests: $(objpfx)begin-end-check.out
+$(objpfx)begin-end-check.out: scripts/begin-end-check.pl
+       $(PERL) scripts/begin-end-check.pl $(installed-headers) > $@
+endif
+
 # The realclean target is just like distclean for the parent, but we want
 # the subdirs to know the difference in case they care.
 realclean distclean: parent-clean
@@ -295,66 +327,118 @@ distclean-1: subdir_$(distclean-1)
        -rm -f $(config-generated)
        -rm -f $(addprefix $(objpfx),config.status config.cache config.log)
        -rm -f $(addprefix $(objpfx),config.make config-name.h config.h)
-       -rm -f $(addprefix $(objpfx),glibcbug)
 ifdef objdir
        -rm -f $(objpfx)Makefile
 endif
        -rm -f $(sysdep-$(distclean-1))
 \f
-.PHONY: echo_subdirs
-echo_subdirs:;@echo '$(subdirs)'
-
-.PHONY: echo-distinfo parent_echo-distinfo
-echo-distinfo: parent_echo-distinfo subdir_echo-distinfo
-parent_echo-distinfo:
-       @echo $(addprefix +header+,$(headers)) \
-             $(addprefix +nodist+,$(generated))
-
+# Make the TAGS file for Emacs users.
+
+.PHONY: TAGS
+TAGS:
+       scripts/list-sources.sh | sed -n '/Makefile/p;\
+         $(foreach S,[chsSyl] cxx sh bash pl,\
+                   $(subst .,\.,/.$S\(.in\)*$$/p;))' \
+       | $(ETAGS) -o $@ -
 \f
 # Make the distribution tarfile.
+.PHONY: dist tag-for-dist
+
+generated := $(generated) stubs.h
 
-distribute  := README README.libm INSTALL FAQ NOTES NEWS PROJECTS BUGS \
-              COPYING.LIB COPYING ChangeLog ChangeLog.[0-9]            \
-              Makefile Makeconfig Makerules Rules Make-dist MakeTAGS   \
-              extra-lib.mk o-iterator.mk                               \
-              libc.map mkinstalldirs move-if-change install-sh         \
-              configure configure.in aclocal.m4 config.sub config.guess\
-              config.h.in config.make.in config-name.in Makefile.in    \
-              autolock.sh rellns-sh munch-tmpl.c munch.awk interp.c    \
-              sysdep.h set-hooks.h libc-symbols.h version.h shlib-versions \
-              rpm/Makefile rpm/template rpm/rpmrc glibcbug.in abi-tags \
-              stub-tag.h test-installation.pl test-skeleton.c          \
-              include/des.h
+README: README.template version.h
+       -rm -f $@
+       sed -e 's/RELEASE/$(release)/' -e 's/VERSION/$(version)/' < $< > $@
+# Make it unwritable so I won't change it by mistake.
+       chmod 444 $@
+ifeq ($(with-cvs),yes)
+       test ! -d CVS || cvs $(CVSOPTS) commit -m'Remade for $(release)-$(version)' $@
+endif
+
+files-for-dist := README FAQ INSTALL NOTES configure
+
+tag-of-stem = glibc-$(subst .,_,$*)
+dist-selector = -r $(tag-of-stem)
+
+# Add-ons in the main repository but distributed in their own tar files.
+dist-separate = libidn
+
+glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \
+                                             $(foreach D,$(dist-separate),\
+                                                       $D/configure)
+       @rm -fr glibc-$*
+       $(MAKE) -q `find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \
+                        -name configure`
+       cvs $(CVSOPTS) -Q export -d glibc-$* $(dist-selector) libc
+# Touch all the configure scripts going into the tarball since cvs export
+# might have delivered configure.in newer than configure.
+       find glibc-$* -name configure -print | xargs touch
+       $(dist-do-separate-dirs)
+       tar cf glibc-$*.tar glibc-$*
+       rm -fr glibc-$*
+define dist-do-separate-dirs
+$(foreach dir,$(dist-separate),
+       @rm -fr glibc-$(dir)-$*
+       mv glibc-$*/$(dir) glibc-$(dir)-$*
+       tar cf glibc-$(dir)-$*.tar glibc-$(dir)-$*
+       rm -fr glibc-$(dir)-$*
+)
+endef
 
-distribute := $(strip $(distribute))
-generated := $(generated) stubs.h version-info.h
+# Do `make dist dist-version=X.Y.Z' to make tar files of an older version.
+dist-version = $(version)
 
-README: README.template version.h ; # Make-dist should update README.
+dist: $(foreach Z,.bz2 .gz,glibc-$(dist-version).tar$Z \
+                          $(foreach D,$(dist-separate),\
+                                    glibc-$D-$(dist-version).tar$Z))
+       md5sum $^
+
+tag-for-dist: tag-$(dist-version)
+tag-%: $(files-for-dist)
+       cvs $(CVSOPTS) -Q tag -c $(tag-of-stem)
 
 define format-me
 @rm -f $@
-makeinfo --no-validate --no-warn --no-headers $< -o $@
+makeinfo --no-validate --plaintext --no-number-sections $< -o $@
 -chmod a-w $@
 endef
 INSTALL: manual/install.texi; $(format-me)
 NOTES: manual/creature.texi; $(format-me)
 manual/dir-add.texi manual/dir-add.info: FORCE
        $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
-FAQ: gen-FAQ.pl FAQ.in
+FAQ: scripts/gen-FAQ.pl FAQ.in
        $(PERL) $^ > $@.new && rm -f $@ && mv $@.new $@ && chmod a-w $@
 ifeq ($(with-cvs),yes)
        test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated:  $(PERL) $^' $@
 endif
 FORCE:
 
-rpm/%: subdir_distinfo
-       $(MAKE) $(PARALLELMFLAGS) -C $(@D) subdirs='$(subdirs)' $(@F)
-
-iconvdata/%:
+iconvdata/% localedata/% po/% manual/%: FORCE
        $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
 
-# This is a special goal for people making binary distributions.  Normally
-# everybody uses the DES based crypt library but for the distribution we
-# need the only-MD5 based one as well.
-md5-crypt/libmd5crypt:
-       $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
+# glibc 2.0 contains some header files which aren't used with glibc 2.1
+# anymore.
+# These rules should remove those headers
+ifeq (,$(install_root))
+ifeq ($(old-glibc-headers),yes)
+install: remove-old-headers
+endif
+endif
+
+headers2_0 :=  __math.h bytesex.h confname.h direntry.h elfclass.h     \
+               errnos.h fcntlbits.h huge_val.h ioctl-types.h           \
+               ioctls.h iovec.h jmp_buf.h libc-lock.h local_lim.h      \
+               mathcalls.h mpool.h nan.h ndbm.h posix1_lim.h           \
+               posix2_lim.h posix_opt.h resourcebits.h schedbits.h     \
+               selectbits.h semaphorebits.h sigaction.h sigcontext.h   \
+               signum.h sigset.h sockaddrcom.h socketbits.h stab.def   \
+               statbuf.h statfsbuf.h stdio-lock.h stdio_lim.h          \
+               syscall-list.h termbits.h timebits.h ustatbits.h        \
+               utmpbits.h utsnamelen.h waitflags.h waitstatus.h        \
+               xopen_lim.h gnu/types.h sys/ipc_buf.h                   \
+               sys/kernel_termios.h sys/msq_buf.h sys/sem_buf.h        \
+               sys/shm_buf.h sys/socketcall.h sigstack.h
+
+.PHONY: remove-old-headers
+remove-old-headers:
+       rm -f $(addprefix $(inst_includedir)/, $(headers2_0))