It was too confusing to have two "libparted" directories, one for parted, and another, internal-only one for gnulib. This fixes that.
The 2nd patch just updates README-hacking. >From 9b067b3ef8c5864313d530c9bc4c6af89a7f5af1 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Wed, 3 Jun 2009 11:54:32 +0200 Subject: [PATCH 1/2] build: rename internal library: lib/libparted -> lib/libgnulib * bootstrap.conf (gnulib_name): Define gnulib_name=libgnulib. * libparted/Makefile.am (libparted_la_LIBADD): Update sole use. --- bootstrap.conf | 2 ++ libparted/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 5b3b03c..dcb0499 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -126,3 +126,5 @@ if test -d .git; then test -e ChangeLog || git log --pretty=medium | fold -s > ChangeLog fi + +gnulib_name=libgnulib diff --git a/libparted/Makefile.am b/libparted/Makefile.am index 25259dd..c46cbd1 100644 --- a/libparted/Makefile.am +++ b/libparted/Makefile.am @@ -39,7 +39,7 @@ EXTRA_libparted_la_SOURCES = arch/linux.c \ libparted_la_LIBADD = \ fs/libfs.la \ labels/liblabels.la \ - $(top_builddir)/lib/libparted.la \ + $(top_builddir)/lib/libgnulib.la \ $(OS_LIBS) \ $(DL_LIBS) \ $(DM_LIBS) \ -- 1.6.3.1.308.g426b5 >From 1682bef690baf3d1cc64aceea359284c1ddacb6f Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Wed, 3 Jun 2009 12:14:05 +0200 Subject: [PATCH 2/2] doc: sync README-hacking from coreutils * README-hacking: update --- README-hacking | 58 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 18 deletions(-) diff --git a/README-hacking b/README-hacking index 3eb86aa..81ab7f3 100644 --- a/README-hacking +++ b/README-hacking @@ -5,45 +5,63 @@ These requirements do not apply when building from a distribution tarball. * Requirements -Only the sources are installed in the GIT repository (to ease the -maintenance, merges etc.), therefore you will have to get the latest -stable versions of the maintainer tools we depend upon, including: +We've opted to keep only the highest-level sources in the GIT repository. +This eases our maintenance burden, (fewer merges etc.), but imposes more +requirements on anyone wishing to build from the just-checked-out sources. +Specific tools and versions will be checked for and listed by the +bootstrap script shown below, and will include: - Automake <http://www.gnu.org/software/automake/> - Autoconf <http://www.gnu.org/software/autoconf/> - Gettext <http://www.gnu.org/software/gettext/> +- Git <http://git.or.cz/> - Gzip <http://www.gnu.org/software/gzip/> +- Perl <http://www.cpan.org/> +- Rsync <http://samba.anu.edu.au/rsync/> - Libtool <http://www.gnu.org/software/libtool/> - Pkg-config <http://pkg-config.freedesktop.org/> - Tar <http://www.gnu.org/software/tar/> - Uuid-devel <http://e2fsprogs.sourceforge.net/> (Debian: uuid-dev, Red Hat: uuid-devel) -- Wget <http://www.gnu.org/software/wget/> + +Only building the initial full source tree will be a bit painful. +Later, a plain `git pull && make' should be sufficient. + +- Valgrind Valgrind <http://valgrind.org/> is also highly recommended, if Valgrind supports your architecture. -Only building the initial full source tree will be a bit painful. -Later, a plain `git-pull && make' should be sufficient. +- XZ utils (successor to LZMA) + +This package's build procedure uses XZ to create a compressed +distribution tarball. Using this feature of Automake requires +version 1.10a or newer, as well as the xz program itself. +Make sure you have the latest version of the XZ Utils from +<http://tukaani.org/lzma/download>. * First GIT checkout -Obviously, if you are reading these notes, you did manage to check out -this package from GIT. The next step is to get other files needed to -build, which are extracted from other source packages: +You can get a copy of the source repository like this: + + $ git clone git://git.debian.org/git/parted/parted.git + $ cd parted - $ ./bootstrap +The next step is to get and check other files needed to build, +which are extracted from other source packages: + + $ ./bootstrap And there you are! Just - $ ./configure - $ make - $ make check + $ ./configure #[--enable-gcc-warnings] + $ make + $ make check At this point, there should be no difference between your local copy, and the GIT master copy: - $ git-diff + $ git-diff should output no difference. @@ -51,12 +69,12 @@ Enjoy! ----- -Copyright (C) 2002-2007 Free Software Foundation, Inc. +Copyright (C) 2002-2009 Free Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify +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, or (at your option) -any later version. +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 @@ -65,3 +83,7 @@ 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/>. + +Local Variables: +indent-tabs-mode: nil +End: -- 1.6.3.1.308.g426b5 _______________________________________________ parted-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/parted-devel
