diff options
author | James Youngman <jay@gnu.org> | 2011-06-03 00:12:55 +0100 |
---|---|---|
committer | James Youngman <jay@gnu.org> | 2011-06-04 00:20:27 +0100 |
commit | a80e33b1c1464e3d6733e73c920fbf4436ff3c5b (patch) | |
tree | 5f18ada839f1d5bc87f6e584bc8fc226b9149a5e | |
parent | 1d37a22a7f1d3b08c086430b96071c293c02e6d0 (diff) | |
download | findutils-a80e33b1c1464e3d6733e73c920fbf4436ff3c5b.tar.gz |
Don't display a separate gnulib version.
* lib/findutils-version.c (display_findutils_version): Don't
display gnulib_version because it's no longer defined (because
there is no gnulib version separate from the findutils version,
now that gnulib is a submodule).
* import-gnulib.config: remove gnulib_version and destdir, they
are not needed any more.
* lib/Makefile.am (EXTRA_DIST): Don't distribute gnulib-version.h
or gnulib-version.c.
(BUILT_SOURCES): delete, there are no longer any built sources.
* lib/gnulib-version.h: Remove.
* locate/code.c: Don't include gnulib-version.h
* xargs/xargs.c: Don't include gnulib-version.h
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | import-gnulib.config | 4 | ||||
-rw-r--r-- | lib/Makefile.am | 5 | ||||
-rw-r--r-- | lib/findutils-version.c | 4 | ||||
-rw-r--r-- | lib/gnulib-version.h | 18 | ||||
-rw-r--r-- | locate/code.c | 1 | ||||
-rw-r--r-- | xargs/xargs.c | 1 |
7 files changed, 18 insertions, 31 deletions
@@ -1,3 +1,19 @@ +2011-06-03 James Youngman <jay@gnu.org> + + Don't display a separate gnulib version. + * lib/findutils-version.c (display_findutils_version): Don't + display gnulib_version because it's no longer defined (because + there is no gnulib version separate from the findutils version, + now that gnulib is a submodule). + * import-gnulib.config: remove gnulib_version and destdir, they + are not needed any more. + * lib/Makefile.am (EXTRA_DIST): Don't distribute gnulib-version.h + or gnulib-version.c. + (BUILT_SOURCES): delete, there are no longer any built sources. + * lib/gnulib-version.h: Remove. + * locate/code.c: Don't include gnulib-version.h + * xargs/xargs.c: Don't include gnulib-version.h + 2011-06-01 James Youngman <jay@gnu.org> Take the last matching entry in /etc/mtab, not the first. diff --git a/import-gnulib.config b/import-gnulib.config index 44c90448..e7f351d9 100644 --- a/import-gnulib.config +++ b/import-gnulib.config @@ -1,9 +1,5 @@ # findutils gnulib.config -*- sh -*- -# What version of gnulib to use? -gnulib_version="533fd9cee8195db5cfa76b30fd0c6bcee583163c" -destdir="gnulib" - # Random extra gnulib files needed for findutils. extra_files=' build-aux/config.guess diff --git a/lib/Makefile.am b/lib/Makefile.am index 21967311..9aa578ea 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -18,11 +18,10 @@ else TESTS += check-regexprops endif -libfind_a_SOURCES = gnulib-version.c findutils-version.c +libfind_a_SOURCES = findutils-version.c EXTRA_DIST = extendbuf.h savedirinfo.h buildcmd.h \ - gnulib-version.h gnulib-version.c findutils-version.h \ + findutils-version.h \ fdleak.h unused-result.h check-regexprops.sh -BUILT_SOURCES = gnulib-version.c SUFFIXES = MOSTLYCLEANFILES = CLEANFILES = check-regexprops diff --git a/lib/findutils-version.c b/lib/findutils-version.c index f3ada258..5b8d4c69 100644 --- a/lib/findutils-version.c +++ b/lib/findutils-version.c @@ -18,9 +18,6 @@ #include <config.h> #include "stdio-safer.h" #include "version-etc.h" -#include "gnulib-version.h" - - #if ENABLE_NLS # include <libintl.h> @@ -61,5 +58,4 @@ display_findutils_version (const char *official_name) _("James Youngman"), _("Kevin Dalley"), (const char*) NULL); - printf (_("Built using GNU gnulib version %s\n"), gnulib_version); } diff --git a/lib/gnulib-version.h b/lib/gnulib-version.h deleted file mode 100644 index 73466c3b..00000000 --- a/lib/gnulib-version.h +++ /dev/null @@ -1,18 +0,0 @@ -/* gnulib-version.h - Copyright (C) 2007, 2010 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -extern const char * const gnulib_version; diff --git a/locate/code.c b/locate/code.c index 7d06a668..7096d737 100644 --- a/locate/code.c +++ b/locate/code.c @@ -73,7 +73,6 @@ #include "locatedb.h" #include "closeout.h" #include "xalloc.h" -#include "gnulib-version.h" #include "progname.h" #include "error.h" #include "findutils-version.h" diff --git a/xargs/xargs.c b/xargs/xargs.c index 97f530f7..120483e5 100644 --- a/xargs/xargs.c +++ b/xargs/xargs.c @@ -98,7 +98,6 @@ #include <xalloc.h> #include "closein.h" -#include "gnulib-version.h" void error (int status, int errnum, char *message,...); |