Don't autogenerate version.c.

5 files changed, 14 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index c3017b23..48dd8a43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-12-06         Arnold D. Robbins     <arnold@skeeve.com>
+
+	No need to generate version.c from version.in.
+	Thanks to John E. Malmberg <wb8tyw@qsl.net> for the suggestion.
+
+	* version.in: Removed.
+	* version.c: Use PACKAGE_STRING directly.
+	* Makefile.am (EXTRA_DIST): Remove version.in.
+	(distcleancheck_listfiles): Remove this rule.
+	(MAINTAINERCLEANFILES): Remove this definition.
+	(version.c): Remove the rule to create it.
+
 2013-12-05         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Fixes for Z/OS.
diff --git a/Makefile.am b/Makefile.am
index f9968c6d..efb3711f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,15 +55,9 @@ EXTRA_DIST = \
 	regex_internal.c \
 	regex_internal.h \
 	regexec.c \
-	version.in \
 	vms \
 	ylwrap
 
-# It's OK for the generated file `version.c' not to be removed by
-# "make distclean".
-distcleancheck_listfiles = \
-  find . -type f -print | grep -v '^\./version\.c$$'
-
 # The order to do things in.
 # Build explicitly in "." in order to build gawk first, so
 # that `make check' without a prior `make' works.
@@ -147,8 +141,6 @@ DEFS= -DDEFPATH=$(DEFPATH) -DDEFLIBPATH=$(DEFLIBPATH) -DSHLIBEXT=$(SHLIBEXT) -DH
 # Get rid of core files when cleaning
 CLEANFILES = core core.*
 
-MAINTAINERCLEANFILES = version.c
-
 # We want hard links for install-exec-hook, below
 LN= ln
 
@@ -196,9 +188,6 @@ awkgram.c: awkgram.y
 	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
 	else :; fi
 
-version.c: config.status version.in
-	$(SHELL) ./config.status --file=version.c:version.in
-
 command.c: command.y
 	$(YACC) -p zz $<
 	sed 's/parse error/syntax error/g' < y.tab.c | awk -f $(srcdir)/bisonfix.awk command > $*.c && rm y.tab.c
diff --git a/Makefile.in b/Makefile.in
index b60fe7e1..c6cf7247 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -269,6 +269,7 @@ DIST_TARGETS = dist-lzip dist-xz dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
 
 # Directory for gawk's data files. Automake supplies datadir.
 pkgdatadir = $(datadir)/awk
@@ -431,17 +432,10 @@ EXTRA_DIST = \
 	regex_internal.c \
 	regex_internal.h \
 	regexec.c \
-	version.in \
 	vms \
 	ylwrap
 
 
-# It's OK for the generated file `version.c' not to be removed by
-# "make distclean".
-distcleancheck_listfiles = \
-  find . -type f -print | grep -v '^\./version\.c$$'
-
-
 # The order to do things in.
 # Build explicitly in "." in order to build gawk first, so
 # that `make check' without a prior `make' works.
@@ -517,7 +511,6 @@ DEFLIBPATH = "\"$(pkgextensiondir)\""
 
 # Get rid of core files when cleaning
 CLEANFILES = core core.*
-MAINTAINERCLEANFILES = version.c
 
 # We want hard links for install-exec-hook, below
 LN = ln
@@ -1026,7 +1019,6 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f awkgram.c
 	-rm -f command.c
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -1167,9 +1159,6 @@ awkgram.c: awkgram.y
 	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
 	else :; fi
 
-version.c: config.status version.in
-	$(SHELL) ./config.status --file=version.c:version.in
-
 command.c: command.y
 	$(YACC) -p zz $<
 	sed 's/parse error/syntax error/g' < y.tab.c | awk -f $(srcdir)/bisonfix.awk command > $*.c && rm y.tab.c
diff --git a/version.c b/version.c
index 2ef261dc..f5cf6ac0 100644
--- a/version.c
+++ b/version.c
@@ -1,3 +1,3 @@
 #include "config.h"
 
-const char *version_string = "GNU Awk 4.1.0a";
+const char *version_string = PACKAGE_STRING;
diff --git a/version.in b/version.in
deleted file mode 100644
index a489761a..00000000
--- a/version.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "config.h"
-
-const char *version_string = "@PACKAGE_STRING@";