Remove handling of VCs other then git

diff --git a/ChangeLog b/ChangeLog
index fced7f1..d9866de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-17  Ulrich Drepper  <drepper@gmail.com>
+
+       * Makefile.in: Remove CVSOPT handling.
+       * configure.in: Remove use of AC_REVISION.
+       * iconvdata/Makefile (distribute): No need to filter out CVS.
+       * scripts/list-sources.sh: Remove CVS, subversion and monotone
+       handling.
+
 2011-11-16  Andreas Schwab  <schwab@redhat.com>
 
        * sysdeps/i386/i686/multiarch/strcmp-ssse3.S
@@ -13,7 +21,7 @@
 
 2011-11-15  Ulrich Drepper  <drepper@gmail.com>
 
-       * locale/loadarchive.c (_nl_load_locale_from_archive): Open files to
+       * locale/loadarchive.c (_nl_load_locale_from_archive): Open files with
        O_CLOEXEC.
        * locale/loadlocale.c (_nl_load_locale): Likewise.
 

diff --git a/FAQ b/FAQ
index 54f422a..bd5849e 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -605,10 +605,10 @@ builtins (__builtin_*).
 
 Without optimizations enabled GNU CC will not inline functions. The
 early startup of the dynamic loader will make function calls via an
-unrelocated PLT and crash. 
+unrelocated PLT and crash.
 
 Without auditing the dynamic linker code it would be difficult to remove
-this requirement. 
+this requirement.
 
 Another reason is that nested functions must be inlined in many cases to
 avoid executable stacks.
@@ -1204,7 +1204,7 @@ solutions:
 {AJ} You might get the following errors when upgrading to glibc 2.1:
 
   In file included from /usr/include/stdio.h:57,
-                   from ...
+                  from ...
   /usr/include/libio.h:335: parse error before `_IO_seekoff'
   /usr/include/libio.h:335: parse error before `_G_off64_t'
   /usr/include/libio.h:336: parse error before `_IO_seekpos'
@@ -1278,10 +1278,7 @@ and gives more details for some topics.
 
 2.33.  The makefiles want to do a CVS commit.
 
-{UD} Only if you are not specifying the --without-cvs flag at configure
-time.  This is what you always have to use if you are checking sources
-directly out of the public CVS repository or you have your own private
-repository.
+{} Removed.  Does not apply anymore.
 
 
 2.34.  When compiling C++ programs, I get a compilation error in streambuf.h.

diff --git a/FAQ.in b/FAQ.in
index 0eb6bac..af61599 100644 (file)
--- a/FAQ.in
+++ b/FAQ.in
@@ -400,10 +400,10 @@ builtins (__builtin_*).
 
 Without optimizations enabled GNU CC will not inline functions. The
 early startup of the dynamic loader will make function calls via an
-unrelocated PLT and crash. 
+unrelocated PLT and crash.
 
 Without auditing the dynamic linker code it would be difficult to remove
-this requirement. 
+this requirement.
 
 Another reason is that nested functions must be inlined in many cases to
 avoid executable stacks.
@@ -971,7 +971,7 @@ solutions:
 {AJ} You might get the following errors when upgrading to glibc 2.1:
 
   In file included from /usr/include/stdio.h:57,
-                   from ...
+                  from ...
   /usr/include/libio.h:335: parse error before `_IO_seekoff'
   /usr/include/libio.h:335: parse error before `_G_off64_t'
   /usr/include/libio.h:336: parse error before `_IO_seekpos'
@@ -1041,10 +1041,7 @@ and gives more details for some topics.
 
 ??     The makefiles want to do a CVS commit.
 
-{UD} Only if you are not specifying the --without-cvs flag at configure
-time.  This is what you always have to use if you are checking sources
-directly out of the public CVS repository or you have your own private
-repository.
+{} Removed.  Does not apply anymore.
 
 ??     When compiling C++ programs, I get a compilation error in streambuf.h.
 

diff --git a/Makefile.in b/Makefile.in
index 1c1e2c1..1f5dc1c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,14 +3,9 @@ srcdir = @srcdir@
 # Uncomment the line below if you want to do parallel build.
 # PARALLELMFLAGS = -j 4
 
-# This option is for those who modify the sources and keep them in a
-# CVS repository.  Sometimes it is necessary to pass options to the cvs
-# program (not the command), like -z9 or -x.
-# CVSOPTS = -z9
-
 all .DEFAULT:
-       $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" CVSOPTS="$(CVSOPTS)" -C $(srcdir) objdir=`pwd` $@
+       $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@
 
 install:
        LANGUAGE=C LC_ALL=C; export LANGUAGE LC_ALL; \
-       $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" CVSOPTS="$(CVSOPTS)" -C $(srcdir) objdir=`pwd` $@
+       $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@

diff --git a/configure b/configure
index 55cb008..c22ed38 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,4 @@
 #! /bin/sh
-# From configure.in CVSid.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for GNU C Library (see version.h).
 #

diff --git a/configure.in b/configure.in
index 9678cbe..2c4fc97 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,4 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION([$CVSid$])
 AC_PREREQ(2.53)dnl             dnl Minimum Autoconf version required.
 AC_INIT([GNU C Library], [(see version.h)], [http://sourceware.org/bugzilla/], [glibc])
 AC_CONFIG_SRCDIR([include/features.h])

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 94f860a..1860660 100644 (file)
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -130,7 +130,7 @@ 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 $(filter-out testdata/CVS%, $(wildcard testdata/*))     \
+             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 \

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 8bd381f..43bd3bf 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-17  Ulrich Drepper  <drepper@gmail.com>
+
+       * Makefile (charmaps): Not need to filter out any of the VC
+       directories.
+       (locales): Likewise.
+
 2011-11-11  Ulrich Drepper  <drepper@gmail.com>
 
        [BZ #13147]

diff --git a/localedata/Makefile b/localedata/Makefile
index 51c61a7..4c4acd3 100644 (file)
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -23,13 +23,10 @@ subdir := localedata
 all: # Make this the default target; it will be defined in Rules.
 
 # List with all available character set descriptions.
-charmaps := $(filter-out $(addprefix charmaps/, CVS RCS SCCS %~), \
-                                    $(wildcard charmaps/[A-I]*) \
-                                    $(wildcard charmaps/[J-Z]*))
+charmaps := $(wildcard charmaps/[A-I]*) $(wildcard charmaps/[J-Z]*)
 
 # List with all available character set descriptions.
-locales := $(filter-out $(addprefix locales/, CVS RCS SCCS %~), \
-                                   $(wildcard locales/*))
+locales := $(wildcard locales/*)
 
 
 subdir-dirs = tests-mbwc

diff --git a/scripts/list-sources.sh b/scripts/list-sources.sh
index 41c8b9e..53b6f7f 100755 (executable)
--- a/scripts/list-sources.sh
+++ b/scripts/list-sources.sh
@@ -9,23 +9,7 @@ case $# in
 *) echo >&2 "Usage: $0 [top_srcdir]"; exit 2 ;;
 esac
 
-if [ -r CVS/Entries ]; then
-
-  ${CVS:-cvs} status 2>&1 | ${AWK:-awk} '
-NF >= 2 && $(NF - 1) == "Examining" { dir = $NF }
-$1 == "File:" { print (dir == ".") ? $2 : (dir "/" $2) }'
-  exit $?
-
-elif [ -r .svn/entries ]; then
-
-  ${SVN:-svn} ls -R | sed '/\/$/d'
-  exit $?
-
-elif [ -r MT/options ]; then
-
-  exec ${MONOTONE:-monotone} list known
-
-elif [ -r .git/HEAD ]; then
+if [ -r .git/HEAD ]; then
 
   exec ${GIT:-git} ls-files