X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=version.c;h=d057f9c3b8310505215ba9c183a7deac710290a9;hp=d2df4818f4cb240482e5bf48028c5d5d5fd88368;hb=62c0894fbb589dd45e69b7d9ef1fd152a9960d62;hpb=06b3e7bc1b04def7488a5c5cd65de00aca655612;ds=sidebyside

diff --git a/version.c b/version.c
index d2df4818..d057f9c3 100644
--- a/version.c
+++ b/version.c
@@ -1,33 +1,24 @@
-#include "para.h"
+/* Copyright (C) 2013 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
-/** \file version.h Macros for printing the version string. */
+/** \file version.c Some helpers for printing version and copyright strings. */
 
+#include "para.h"
+#include "version.h"
 #include "git-version.h"
 
-/**
- * Get the raw git version string
- *
- * \return The string generated by the GIT-VERSION-GEN script. It is passed
- * as a preprocessor define during compilation.
- */
-const char *version_git(void)
-{
-	return GIT_VERSION;
-}
-
 /**
  * Get the version string for an executable.
  *
  * \param pfx The program name (without the leading "para_").
  *
- * \return A statically allocated string which contains the program name, the
- * git version and the codename. It must not be freed by the caller.
+ * \return A statically allocated string which contains the program name and
+ * the git version. It must not be freed by the caller.
  */
 const char *version_single_line(const char *pfx)
 {
 	static char buf[100];
 	snprintf(buf, sizeof(buf) - 1,
-		"para_%s " GIT_VERSION " (" CODENAME ")", pfx);
+		"para_%s " GIT_VERSION, pfx);
 	return buf;
 }
 
@@ -48,11 +39,13 @@ const char *version_text(const char *pfx)
 	static char buf[512];
 
 	snprintf(buf, sizeof(buf) - 1, "%s\n"
-		"built: " BUILD_DATE ", " UNAME_RS ", " CC_VERSION "\n"
-		"Copyright (C) 2013 Andre Noll\n"
+		"Copyright (C) " COPYRIGHT_YEAR " Andre Noll\n"
 		"This is free software with ABSOLUTELY NO WARRANTY."
 		" See COPYING for details.\n"
-		"Report bugs to <maan@systemlinux.org>.\n",
+		"Report bugs to <maan@tuebingen.mpg.de>.\n"
+		"build date: " BUILD_DATE ",\n"
+		"build system: " UNAME_RS ",\n"
+		"compiler: " CC_VERSION ".\n",
 		version_single_line(pfx)
 	);
 	return buf;