[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 debug/clearfat/clearfat.c |    2 +-
 parted/Makefile.am        |   26 +++++++++++++++++++++++++-
 parted/parted.c           |    5 +++--
 partprobe/partprobe.c     |    2 +-
 4 files changed, 30 insertions(+), 5 deletions(-)

New commits:
commit f3b251c82c3a38b0ceb21798b9774de7e97d973a
Author: Jim Meyering <meyering at redhat.com>
Date:   Tue Apr 27 12:19:45 2010 +0200

    doc: use a valid http:.../AUTHORS URL
    
    * debug/clearfat/clearfat.c (AUTHORS): Point to the git repo.
    * parted/parted.c (AUTHORS): Likewise.
    * partprobe/partprobe.c (AUTHORS): Likewise.
    
    * parted/parted.c: Include "version.h".
    (_version): Use Version, not VERSION.

diff --git a/debug/clearfat/clearfat.c b/debug/clearfat/clearfat.c
index 0c69916..a8274b2 100644
--- a/debug/clearfat/clearfat.c
+++ b/debug/clearfat/clearfat.c
@@ -53,7 +53,7 @@
 #define PROGRAM_NAME "clearfat"
 
 #define AUTHORS \
-  "<http://parted.alioth.debian.org/cgi-bin/trac.cgi/browser/AUTHORS>"
+  "<http://git.debian.org/?p=parted/parted.git;a=blob_plain;f=AUTHORS>"
 
 static void
 usage (int status)
diff --git a/parted/parted.c b/parted/parted.c
index fa4b4d0..edf3249 100644
--- a/parted/parted.c
+++ b/parted/parted.c
@@ -30,7 +30,7 @@
 #include "version.h"
 
 #define AUTHORS \
-  "<http://parted.alioth.debian.org/cgi-bin/trac.cgi/browser/AUTHORS>"
+  "<http://git.debian.org/?p=parted/parted.git;a=blob_plain;f=AUTHORS>"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "parted"
diff --git a/partprobe/partprobe.c b/partprobe/partprobe.c
index a3aa07d..c6dc0b9 100644
--- a/partprobe/partprobe.c
+++ b/partprobe/partprobe.c
@@ -50,7 +50,7 @@
 #define _(msgid) gettext (msgid)
 
 #define AUTHORS \
-  "<http://parted.alioth.debian.org/cgi-bin/trac.cgi/browser/AUTHORS>"
+  "<http://git.debian.org/?p=parted/parted.git;a=blob_plain;f=AUTHORS>"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "partprobe"

commit a206a36b53ae3d6e0454cd6c3f99618b147b941f
Author: Jim Meyering <meyering at redhat.com>
Date:   Mon Apr 26 18:44:40 2010 +0200

    ui: get version number from a separately-compiled file
    
    * parted/Makefile.am (version.c, version.h): Generate.
    (parted_LDADD): Add libver.a.
    (noinst_LIBRARIES, nodist_libver_a_SOURCES): Define.
    (BUILT_SOURCES): Initialize and append.
    (MAINTAINERCLEANFILES): Update.
    * parted/parted.c: Include "version.h".
    (_version): Use the new global variable, Version, not VERSION.

diff --git a/parted/Makefile.am b/parted/Makefile.am
index 96bd109..5838590 100644
--- a/parted/Makefile.am
+++ b/parted/Makefile.am
@@ -1,3 +1,5 @@
+BUILT_SOURCES =
+
 sbin_PROGRAMS = parted
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
@@ -13,10 +15,32 @@ parted_SOURCES = command.c	\
 		 table.c	\
 		 table.h
 
+noinst_LIBRARIES = libver.a
+nodist_libver_a_SOURCES = version.c version.h
+
+BUILT_SOURCES += version.c
+version.c: Makefile
+	$(AM_V_GEN)rm -f $@
+	$(AM_V_at)printf '#include <config.h>\n' > $@t
+	$(AM_V_at)printf 'char const *Version = "$(PACKAGE_VERSION)";\n' >> $@t
+	$(AM_V_at)chmod a-w $@t
+	$(AM_V_at)mv $@t $@
+
+BUILT_SOURCES += version.h
+version.h: Makefile
+	$(AM_V_GEN)rm -f $@
+	$(AM_V_at)printf 'extern char const *Version;\n' > $@t
+	$(AM_V_at)chmod a-w $@t
+	$(AM_V_at)mv $@t $@
+
+DISTCLEANFILES = version.c version.h
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+
 #parted_CFLAGS = -DBUILDINFO='"\"'$(BUILDINFO)'\""'
 parted_CFLAGS = -DBUILDINFO=
 
 parted_LDADD = \
+  libver.a \
   $(top_builddir)/libparted/libparted.la \
   $(INTLLIBS) $(LIBS) \
   $(PARTED_LIBS)
@@ -28,4 +52,4 @@ parted_LDFLAGS += $(IGNORE_UNUSED_LIBRARIES_CFLAGS)
 
 INCLUDES	= $(partedincludedir) $(INTLINCS)
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES += Makefile.in
diff --git a/parted/parted.c b/parted/parted.c
index cd1189c..fa4b4d0 100644
--- a/parted/parted.c
+++ b/parted/parted.c
@@ -27,6 +27,7 @@
 #include "ui.h"
 #include "progname.h"
 #include "table.h"
+#include "version.h"
 
 #define AUTHORS \
   "<http://parted.alioth.debian.org/cgi-bin/trac.cgi/browser/AUTHORS>"
@@ -2550,7 +2551,7 @@ textdomain(PACKAGE);
 void
 _version ()
 {
-  version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, VERSION, AUTHORS,
+  version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, Version, AUTHORS,
                (char *) NULL);
 }