diff options
-rw-r--r-- | .cvsignore | 29 | ||||
-rw-r--r-- | .gitignore | 144 | ||||
-rw-r--r-- | ChangeLog | 24 | ||||
-rwxr-xr-x | bootstrap | 101 | ||||
-rw-r--r-- | build-aux/.cvsignore | 7 | ||||
-rw-r--r-- | build-aux/.gitignore | 7 | ||||
-rw-r--r-- | doc/.cvsignore | 27 | ||||
-rw-r--r-- | doc/.gitignore | 27 | ||||
-rw-r--r-- | examples/.cvsignore | 2 | ||||
-rw-r--r-- | examples/.gitignore | 2 | ||||
-rw-r--r-- | ltdl/.cvsignore | 29 | ||||
-rw-r--r-- | ltdl/.gitignore | 29 | ||||
-rw-r--r-- | m4/.cvsignore | 11 | ||||
-rw-r--r-- | m4/.gitignore | 11 | ||||
-rw-r--r-- | modules/.cvsignore | 11 | ||||
-rw-r--r-- | modules/.gitignore | 11 | ||||
-rw-r--r-- | po/.cvsignore | 22 | ||||
-rw-r--r-- | po/.gitignore | 22 | ||||
-rw-r--r-- | src/.cvsignore | 14 | ||||
-rw-r--r-- | src/.gitignore | 14 | ||||
-rw-r--r-- | tests/.cvsignore | 15 | ||||
-rw-r--r-- | tests/.gitignore | 15 |
22 files changed, 166 insertions, 408 deletions
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index b7d70a66..00000000 --- a/.cvsignore +++ /dev/null @@ -1,29 +0,0 @@ -.git -.patch_number -.tarball-version -.version -ABOUT-NLS -aclocal.m4 -aclocal.m4t -autom4te.cache -config.cache -config.h -config-h.in -config.log -config.status -configure -cscope.* -gnu -GNUmakefile -intl -libtool -*.log -m4-* -Makefile -Makefile.in -patches -*.patch -stamp-h -stamp-h1 -stamp-h.in -stamp-vcl @@ -1,33 +1,135 @@ *~ .#* -.patch_number +*.a +.deps +.dirstamp +*.exe +*.gmo +*.header +*.la +.libs +*.lo +*.log +*.mo +*.o *.orig +*.patch +.patch_number +*.po +*.pot *.rej -.tarball-version -.version +*.sin +/.tarball-version +/.version ABOUT-NLS -aclocal.m4 -aclocal.m4t +/aclocal.m4 +/aclocal.m4t autom4te.cache -config.cache -config.h -config-h.in -config.log -config.status -configure +/build-aux/.gitignore +/build-aux/config.rpath +/build-aux/ltmain.sh +/config.cache +/config.h +/config-h.in +/config.log +/config.status +/configure cscope.* CVS -gnu -GNUmakefile -intl +/doc/.gitignore +/doc/m4.1 +/doc/m4.?? +/doc/m4.??? +/doc/m4.html +/doc/m4.info* +/doc/manual +/doc/stamp-vti +/doc/version.texi +/gnu +/GNUmakefile +/intl libtool -*.log +/ltdl/argz.c +/ltdl/argz_.h +/ltdl/argz.h +/ltdl/config +/ltdl/COPYING.LIB +/ltdl/libltdl +/ltdl/loaders +/ltdl/lt*.[ch] +/ltdl/m4/.gitignore +/ltdl/m4/argz.m4 +/ltdl/m4/codeset.m4 +/ltdl/m4/getopt.m4 +/ltdl/m4/gettext.m4 +/ltdl/m4/glibc2.m4 +/ltdl/m4/glibc21.m4 +/ltdl/m4/iconv.m4 +/ltdl/m4/intdiv0.m4 +/ltdl/m4/intl.m4 +/ltdl/m4/intldir.m4 +/ltdl/m4/intmax.m4 +/ltdl/m4/inttypes-pri.m4 +/ltdl/m4/inttypes_h.m4 +/ltdl/m4/lcmessage.m4 +/ltdl/m4/lib-ld.m4 +/ltdl/m4/lib-link.m4 +/ltdl/m4/lib-prefix.m4 +/ltdl/m4/libtool.m4 +/ltdl/m4/lock.m4 +/ltdl/m4/longdouble.m4 +/ltdl/m4/longlong.m4 +/ltdl/m4/ltdl.m4 +/ltdl/m4/ltoptions.m4 +/ltdl/m4/ltsugar.m4 +/ltdl/m4/ltversion.m4 +/ltdl/m4/lt~obsolete.m4 +/ltdl/m4/nls.m4 +/ltdl/m4/po.m4 +/ltdl/m4/printf-posix.m4 +/ltdl/m4/progtest.m4 +/ltdl/m4/size_max.m4 +/ltdl/m4/stdint_h.m4 +/ltdl/m4/uintmax_t.m4 +/ltdl/m4/ulonglong.m4 +/ltdl/m4/visibility.m4 +/ltdl/m4/wchar_t.m4 +/ltdl/m4/wint_t.m4 +/ltdl/m4/xsize.m4 +/ltdl/m4/xstrtol.m4 +/ltdl/README +/ltdl/slist.c /m4-* +/m4/obstack.h +/m4/pathconf.h +/m4/system.h Makefile Makefile.in -patches -*.patch -stamp-h -stamp-h1 -stamp-h.in -stamp-vcl +Makefile.inc +/patches +/po/.reference +/po/*.sed +/po/LINGUAS +/po/Makefile.in.in +/po/Makevars.template +/po/POTFILES +/po/Rules-quot +/po/stamp-po +/src/getopt* +/src/m4 +/src/version-etc* +/src/xstrto* +/stamp-h +/stamp-h1 +/stamp-h.in +/stamp-vcl +/tests/at-* +/tests/atconfig +/tests/atlocal +/tests/m4 +/tests/generated.at +/tests/gnu +/tests/package.m4 +/tests/testsuite +/tests/testsuite.dir +/tests/testsuite.log @@ -1,5 +1,29 @@ 2009-06-15 Eric Blake <ebb9@byu.net> + Drop .cvsignore and redundant .gitignore files. + * .cvsignore: Delete. We are moving further away from CVS. + * build-aux/.cvsignore: Likewise. + * doc/.cvsignore: Likewise. + * examples/.cvsignore: Likewise. + * ltdl/.cvsignore: Likewise. + * m4/.cvsignore: Likewise. + * modules/.cvsignore: Likewise. + * po/.cvsignore: Likewise. + * src/.cvsignore: Likewise. + * tests/.cvsignore: Likewise. + * .gitignore: Consolidate from other files. + * build-aux/.gitignore: Delete, now that it is consolidated. + * doc/.gitignore: Likewise. + * examples/.gitignore: Likewise. + * ltdl/.gitignore: Likewise. + * m4/.gitignore: Likewise. + * modules/.gitignore: Likewise. + * po/.gitignore: Likewise. + * src/.gitignore: Likewise. + * tests/.gitignore: Likewise. + * bootstrap: Simplify accordingly. Sync gnulib tree prior to + libtoolize, to avoid libtool overwriting config.guess. + Avoid compiler warning. * m4/macro.c (process_macro): Use correct type for isdigit. @@ -1,6 +1,6 @@ #! /bin/sh -# bootstrap (GNU M4) version 2009-05-04 +# bootstrap (GNU M4) version 2009-06-15 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software # Foundation, Inc. # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> @@ -296,68 +296,6 @@ esac ## Version control. ## ## ---------------- ## -# gnulib-tool updates ltdl/m4/.{git,cvs}ignore and gnu/.{git,cvs}ignore, and -# keeping generated files under version control does not make sense. Since -# gnu is entirely ignored, we only need to prepopulate the ltdl/m4 ignore -# files with generated files not tracked by gnulib-tool. -if test -f $config_macro_dir/.gitignore ; then - : -else - func_echo "creating initial $config_macro_dir/.cvsignore" - cat > $config_macro_dir/.cvsignore <<\EOF -# files created by gnulib, but that gnulib doesn't track -*~ -.cvsignore -.gitignore -gnulib-comp.m4 -# files manually imported, rather than using gnulib-tool -getopt.m4 -xstrtol.m4 -# files created by autopoint -codeset.m4 -gettext.m4 -glibc2.m4 -glibc21.m4 -iconv.m4 -intdiv0.m4 -intl.m4 -intldir.m4 -intmax.m4 -inttypes-pri.m4 -inttypes_h.m4 -lcmessage.m4 -lib-ld.m4 -lib-link.m4 -lib-prefix.m4 -lock.m4 -longdouble.m4 -longlong.m4 -nls.m4 -po.m4 -printf-posix.m4 -progtest.m4 -size_max.m4 -stdint_h.m4 -uintmax_t.m4 -ulonglong.m4 -visibility.m4 -wchar_t.m4 -wint_t.m4 -xsize.m4 -# files created by libtoolize -argz.m4 -libtool.m4 -ltdl.m4 -ltoptions.m4 -ltsugar.m4 -ltversion.m4 -lt~obsolete.m4 -# gnulib-tool edits below here -EOF - func_echo "creating initial $config_macro_dir/.gitignore" - cp $config_macro_dir/.cvsignore $config_macro_dir/.gitignore -fi - # See if we can use gnulib's git-merge-changelog merge driver. if test -d .git && (git --version) >/dev/null 2>/dev/null ; then if git config merge.merge-changelog.driver >/dev/null ; then @@ -377,25 +315,6 @@ if test -d .git && (git --version) >/dev/null 2>/dev/null ; then fi fi -## ---------- ## -## Autopoint. ## -## ---------- ## - -# Released autopoint has the tendency to install macros that have been -# obsoleted in current gnulib, so run this before gnulib-tool. -func_echo "running: $AUTOPOINT --force" -$AUTOPOINT --force - -## ----------- ## -## Libtoolize. ## -## ----------- ## - -# Autoreconf runs aclocal before libtoolize, which causes spurious -# warnings if the initial aclocal is confused by the libtoolized -# (or worse out-of-date) macro directory. -func_echo "running: $LIBTOOLIZE --copy --install" -${LIBTOOLIZE} --copy --install - ## ------------------------------ ## ## Update the gnulib module tree. ## ## ------------------------------ ## @@ -425,6 +344,24 @@ else func_echo "git not detected. If needed, update gnulib subdirectory manually" fi +## ---------- ## +## Autopoint. ## +## ---------- ## + +# Released autopoint has the tendency to install macros that have been +# obsoleted in current gnulib, so run this before gnulib-tool. +func_echo "running: $AUTOPOINT --force" +$AUTOPOINT --force + +## ----------- ## +## Libtoolize. ## +## ----------- ## + +# Autoreconf runs aclocal before libtoolize, which causes spurious +# warnings if the initial aclocal is confused by the libtoolized +# (or worse out-of-date) macro directory. +func_echo "running: $LIBTOOLIZE --copy --install" +${LIBTOOLIZE} --copy --install ## ---------------------- ## ## Import Gnulib modules. ## diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore deleted file mode 100644 index 9eadd39a..00000000 --- a/build-aux/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -announce-gen -config.rpath -gendocs.sh -git-version-gen -gnupload -link-warning.h -ltmain.sh diff --git a/build-aux/.gitignore b/build-aux/.gitignore deleted file mode 100644 index 57ddcd61..00000000 --- a/build-aux/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/announce-gen -/config.rpath -/gendocs.sh -/git-version-gen -/gnupload -/link-warning.h -/ltmain.sh diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index 91275d6f..00000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,27 +0,0 @@ -*.aux -*.cp -*.cps -*.dvi -*.fn -*.fns -*.html -*.ky -*.log -*.pdf -*.pg -*.ps -*.toc -*.tp -*.vr -.dirstamp -fdl-1.3.texi -gendocs_template -gpl-3.0.texi -Makefile.in -Makefile -manual -m4.info* -m4.1 -regexprops-generic.texi -stamp-vti -version.texi diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index 91275d6f..00000000 --- a/doc/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -*.aux -*.cp -*.cps -*.dvi -*.fn -*.fns -*.html -*.ky -*.log -*.pdf -*.pg -*.ps -*.toc -*.tp -*.vr -.dirstamp -fdl-1.3.texi -gendocs_template -gpl-3.0.texi -Makefile.in -Makefile -manual -m4.info* -m4.1 -regexprops-generic.texi -stamp-vti -version.texi diff --git a/examples/.cvsignore b/examples/.cvsignore deleted file mode 100644 index 3dda7298..00000000 --- a/examples/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/examples/.gitignore b/examples/.gitignore deleted file mode 100644 index 3dda7298..00000000 --- a/examples/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/ltdl/.cvsignore b/ltdl/.cvsignore deleted file mode 100644 index 766a9f7b..00000000 --- a/ltdl/.cvsignore +++ /dev/null @@ -1,29 +0,0 @@ -*.o -*.la -*.lo -.deps -.dirstamp -.libs -aclocal.m4 -argz.c -argz_.h -argz.h -autom4te.cache -config -config-h.in -config.* -configure -configure.ac -COPYING.LIB -libltdl -libtool -loaders -lt*.c -lt*.h -Makefile.am -Makefile.in -Makefile.inc -Makefile -README -slist.c -stamp-h1 diff --git a/ltdl/.gitignore b/ltdl/.gitignore deleted file mode 100644 index 766a9f7b..00000000 --- a/ltdl/.gitignore +++ /dev/null @@ -1,29 +0,0 @@ -*.o -*.la -*.lo -.deps -.dirstamp -.libs -aclocal.m4 -argz.c -argz_.h -argz.h -autom4te.cache -config -config-h.in -config.* -configure -configure.ac -COPYING.LIB -libltdl -libtool -loaders -lt*.c -lt*.h -Makefile.am -Makefile.in -Makefile.inc -Makefile -README -slist.c -stamp-h1 diff --git a/m4/.cvsignore b/m4/.cvsignore deleted file mode 100644 index 72ef9115..00000000 --- a/m4/.cvsignore +++ /dev/null @@ -1,11 +0,0 @@ -*.o -*.lo -*.la -.deps -.dirstamp -.libs -obstack.h -pathconf.h -system.h -Makefile -Makefile.in diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index 72ef9115..00000000 --- a/m4/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -*.o -*.lo -*.la -.deps -.dirstamp -.libs -obstack.h -pathconf.h -system.h -Makefile -Makefile.in diff --git a/modules/.cvsignore b/modules/.cvsignore deleted file mode 100644 index 2ac090ec..00000000 --- a/modules/.cvsignore +++ /dev/null @@ -1,11 +0,0 @@ -*.o -*.lo -*.la -.deps -.dirstamp -.libs -compile -Makefile -Makefile.in -perlxsi.c -testSubDir diff --git a/modules/.gitignore b/modules/.gitignore deleted file mode 100644 index 2ac090ec..00000000 --- a/modules/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -*.o -*.lo -*.la -.deps -.dirstamp -.libs -compile -Makefile -Makefile.in -perlxsi.c -testSubDir diff --git a/po/.cvsignore b/po/.cvsignore deleted file mode 100644 index e1311ac7..00000000 --- a/po/.cvsignore +++ /dev/null @@ -1,22 +0,0 @@ -*~ -*.gmo -*.header -*.mo -*.po -*.pot -*.sin -.reference -boldquot.sed -cat-id-tbl.c -LINGUAS -Makefile -Makefile.in -Makefile.in.in -Makevars.template -m4.html -POTFILES -quot.sed -remove-potcdate.sed -Rules-quot -stamp-cat-id -stamp-po diff --git a/po/.gitignore b/po/.gitignore deleted file mode 100644 index e1311ac7..00000000 --- a/po/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -*~ -*.gmo -*.header -*.mo -*.po -*.pot -*.sin -.reference -boldquot.sed -cat-id-tbl.c -LINGUAS -Makefile -Makefile.in -Makefile.in.in -Makevars.template -m4.html -POTFILES -quot.sed -remove-potcdate.sed -Rules-quot -stamp-cat-id -stamp-po diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index e7b49283..00000000 --- a/src/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -*.o -*.lo -*.la -.deps -.dirstamp -.libs -getopt* -m4 -m4.exe -Makefile -Makefile.in -version-etc* -xstrtol* -xstrtoul* diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index e7b49283..00000000 --- a/src/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -*.o -*.lo -*.la -.deps -.dirstamp -.libs -getopt* -m4 -m4.exe -Makefile -Makefile.in -version-etc* -xstrtol* -xstrtoul* diff --git a/tests/.cvsignore b/tests/.cvsignore deleted file mode 100644 index 537493f4..00000000 --- a/tests/.cvsignore +++ /dev/null @@ -1,15 +0,0 @@ -*.la -.dirstamp -.libs -at-* -atconfig -atlocal -m4 -Makefile -Makefile.in -generated.at -gnu -package.m4 -testsuite -testsuite.dir -testsuite.log diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index 537493f4..00000000 --- a/tests/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.la -.dirstamp -.libs -at-* -atconfig -atlocal -m4 -Makefile -Makefile.in -generated.at -gnu -package.m4 -testsuite -testsuite.dir -testsuite.log |