From: Keith Marshall <keithmarshall@users.sourceforge.net>
Date: Wed, 29 May 2013 22:11:14 +0000 (+0100)
Subject: Update program identification, via configuration process.
X-Git-Url: http://git.osdn.net/view?p=mingw%2Fpexports.git;a=commitdiff_plain;h=a504d2bdc72fe19da5c04cdf1fc973d1cd1ae62c

Update program identification, via configuration process.
---

diff --git a/ChangeLog b/ChangeLog
index 85eceb5..bd5997d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2013-05-29  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
+	Update program identification, via configuration process.
+
+	* pexports.c (main): Update identification text; remove references...
+	(VER_MAJOR, VER_MINOR): ...to these; combine them by substituting...
+	(PACKAGE_VERSION_STRING): ...this new macro; also amend instructions
+	for reporting bugs, as directed at URL identified by...
+	(PACKAGE_BUG_REPORT): ...this additional new macro.
+
+	* pexports.h (VER_MAJOR, VER_MINOR): Obsolete macros; delete them.
+
+	* Makefile.in (PACKAGE_DEFS): New macro; defined in terms of these...
+	(PACKAGE_VERSION_STRING, PACKAGE_BUG_REPORT_URL, PACKAGE_BUG_REPORT):
+	...these additional new macros, defined by AC_SUBST from configure.ac,
+	and subsequently propagated to pexports.c, as an addendum to...
+	(CDEPFLAGS): ...this.
+
+2013-05-29  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
 	Autoconfiscate.
 
 	* configure.ac Makefile.in: New files.
diff --git a/Makefile.in b/Makefile.in
index 1e94fe9..e40d1c7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,7 +87,10 @@ pexports$(EXEEXT): $(OBJECT_FILES)
 # Binary file build rules and dependency tracking.
 #
 INCLUDES = -I ${srcdir}
-CDEPFLAGS = -MMD -MP -MF $*.dep $(CPPFLAGS)
+PACKAGE_BUG_REPORT_URL = PACKAGE_BUG_REPORT='"@PACKAGE_BUGREPORT@"'
+PACKAGE_VERSION_STRING = PACKAGE_VERSION_STRING='"$(PACKAGE_VERSION)"'
+PACKAGE_DEFS = -D $(PACKAGE_VERSION_STRING) -D $(PACKAGE_BUG_REPORT_URL)
+CDEPFLAGS = -MMD -MP -MF $*.dep $(CPPFLAGS) $(PACKAGE_DEFS)
 sinclude *.dep
 
 %.$(OBJEXT): %.c
diff --git a/pexports.c b/pexports.c
index 186497c..310f48a 100644
--- a/pexports.c
+++ b/pexports.c
@@ -141,9 +141,9 @@ main(int argc, char *argv[])
 
   if (filename == NULL)
     {
-      printf("PExports %d.%d Copyright 1998, Anders Norlander\n"
-      	     "Changed 1999, Paul Sokolovsky\n"
-      	     "Changed 2008, Tor Lillqvist\n"
+      printf("PExports %s; Originally written 1998, Anders Norlander\n"
+      	     "Updated 1999, Paul Sokolovsky, 2008, Tor Lillqvist, 2013, Keith Marshall\n"
+	     "Copyright (C) 1998, 1999, 2008, 2013, MinGW.org Project\n\n"
              "This program is free software; you may redistribute it under the terms of\n"
              "the GNU General Public License.  This program has absolutely no warranty.\n"
 
@@ -152,11 +152,8 @@ main(int argc, char *argv[])
              "  -o\tprint ordinals\n"
              "  -p\tset preprocessor program\n"
              "  -v\tverbose mode\n"
-             "\nReport bugs to anorland@hem2.passagen.se,\n"
-	     "Paul.Sokolovsky@technologist.com\n"
-	     "or tml@iki.fi\n",
-             VER_MAJOR, VER_MINOR,
-             program_name);
+             "\nReport bugs as directed at %s\n",
+             PACKAGE_VERSION_STRING, program_name, PACKAGE_BUG_REPORT);
       return 1;
     }
 
diff --git a/pexports.h b/pexports.h
index f4da374..7f7e5d9 100644
--- a/pexports.h
+++ b/pexports.h
@@ -18,9 +18,6 @@
 
 #include "str_tree.h"
 
-#define VER_MAJOR 0
-#define VER_MINOR 44
-
 /* These are needed:
  * FIXME: However, I'd really much prefer to see ISO-C99 standard
  * types used throughout, in preference to these Micrsoft-inspired