From 0a617e33234f6104fdfb0d45593cf313c961f653 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 1 Jun 2009 18:51:45 +0000
Subject: [PATCH 1/1] xml-versioning-take-two-20090601

LICENSE IPL10

deal with this in a way which does not trip creation of CML state config files
---
 acinclude.m4                         |  3 ---
 src/config/Makefile.config.in        |  3 ---
 src/config/Makefile.in               |  2 +-
 src/config/Makefile.version-CML.in   | 19 ++++++++++---------
 src/config/Makefile.version-NOCML.in | 21 ++++++++++++---------
 src/config/mkvers.c                  |  2 +-
 6 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index daa97ca..98b77fa 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1659,9 +1659,6 @@ if test "x$enable_pthreaded_ubik" = "xyes"; then
 ENABLE_PTHREADED_UBIK=yes
 fi
 
-VERSFILE=AFS_component_version_number
-AC_SUBST(VERSFILE)
-
 AC_SUBST(AFS_SYSNAME)
 AC_SUBST(AFS_PARAM_COMMON)
 AC_SUBST(ENABLE_KERNEL_MODULE)
diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index b873f58..a12a9d7 100644
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -129,6 +129,3 @@ LDFLAGS=${XLDFLAGS} ${ARCHFLAGS}
 
 .c.o:
 	$(CCOBJ) $(CFLAGS) -c $<
-
-# Default component version file, will be overridden later if necessary
-VERSFILE=@VERSFILE@
\ No newline at end of file
diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index 951711f..6c48a14 100644
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -37,7 +37,7 @@ Makefile.version: ${srcdir}/Makefile.version-CML Makefile.version-NOCML
 # AFS component version string file generation targets
 #
 AFS_component_version_number.c: Makefile.version
-	$(MAKE) -f Makefile.component AFS_component_version_number.c
+	$(MAKE) -f Makefile.version AFS_component_version_number.c
 
 #
 # App build/install targets
diff --git a/src/config/Makefile.version-CML.in b/src/config/Makefile.version-CML.in
index e77e110..45c4b84 100644
--- a/src/config/Makefile.version-CML.in
+++ b/src/config/Makefile.version-CML.in
@@ -8,22 +8,23 @@
 PACKAGE=@PACKAGE@
 VERSION=@VERSION@
 
-$(VERSFILE).o: $(VERSFILE).c
+AFS_component_version_number.o: AFS_component_version_number.c $(TOP_SRCDIR)/config/mkvers
+version.xml version.txt: $(TOP_SRCDIR)/config/mkvers
 
 # mkvers checks timestamps
 
-$(VERSFILE).c:
-	$(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).c
+AFS_component_version_number.c:
+	$(TOP_SRCDIR)/config/mkvers -o AFS_component_version_number.c
 # only done for RX in NT
 #	-c $(CML_PREFIX)
 
-$(VERSFILE).h:
-	$(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).h -v
+AFS_component_version_number.h:
+	$(TOP_SRCDIR)/config/mkvers -o AFS_component_version_number.h -v
 
-$(VERSFILE).txt:
-	$(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).txt -t
+version.txt:
+	$(TOP_SRCDIR)/config/mkvers -o version.txt -t
 
-$(VERSFILE).xml:
-	$(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).xml -x
+version.xml:
+	$(TOP_SRCDIR)/config/mkvers -o version.xml -x
 
 noversion: install
diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in
index 179a929..0d612dd 100644
--- a/src/config/Makefile.version-NOCML.in
+++ b/src/config/Makefile.version-NOCML.in
@@ -8,14 +8,17 @@
 PACKAGE=@PACKAGE@
 VERSION=@VERSION@
 
-$(VERSFILE).o: $(VERSFILE).c
+AFS_component_version_number.o: AFS_component_version_number.c
 
-$(VERSFILE).c: @TOP_OBJDIR@/src/config/Makefile.version
-	echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >$(VERSFILE).c
-	echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>$(VERSFILE).c
+AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version
+	echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c
+	echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>AFS_component_version_number.c
 
-$(VERSFILE).xml:
-	echo '<?xml version="1.0" encoding="UTF-8"?>' >$(VERSFILE).xml
-	echo '<revision>' >>$(VERSFILE).xml
-	echo '<revnumber>${VERSION}</revnumber>' >>$(VERSFILE).xml
-	echo '</revision>' >>$(VERSFILE).xml
+version.xml:
+	echo '<?xml version="1.0" encoding="UTF-8"?>' >version.xml
+	echo '<revision>' >>version.xml
+	echo '<revnumber>${VERSION}</revnumber>' >>version.xml
+	echo '</revision>' >>version.xml
+
+version.txt:
+	echo "Base configuration unknown" > version.txt
diff --git a/src/config/mkvers.c b/src/config/mkvers.c
index aea2a40..c022796 100644
--- a/src/config/mkvers.c
+++ b/src/config/mkvers.c
@@ -300,7 +300,7 @@ PrintStamps(void)
 	    } else if (cfgFormat == CF_TEXT) {
 		fprintf(fpVers, "Base configuration %s\n",
 			stateDeltas[i].name);
-	    } else if (cfgFormat == CF_TEXT) {
+	    } else if (cfgFormat == CF_XML) {
                 fprintf(fpVers, 
                         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                         "<revision>\n"
-- 
1.9.4