From: Bradley Nicholes <bnicholes@apache.org>
Date: Wed, 16 Oct 2002 23:50:01 +0000 (+0000)
Subject: General make file changes to extract the version string and
X-Git-Tag: 2.0.44~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62195dae7f1cee42a77d45b76688bd7849043ef6;p=thirdparty%2Fapache%2Fhttpd.git

General make file changes to extract the version string and
create NWGNUversion.inc


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97250 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 0f8c97f1d4a..16bb0676589 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -278,7 +278,6 @@ XMLLIB		= $(XML)/$(OBJDIR)/xmllib.lib
 #
 # Additional general defines
 #
-VERSION		= 2,0,0
 
 EnvironmentDefined = 1
 endif # ifndef EnvironmentDefined
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 277450ffb46..8b631f21aa7 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -32,7 +32,7 @@ $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
 nw_export.i : nw_export.inc $(FILES_prebuild_headers) cc.opt
 	@echo Generating $(subst /,\,$@)
 	$(CC) $< @cc.opt
-
+	
 cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NWGNUtail.inc $(AP_WORK)\build\NWGNUhead.inc
 	$(CHK) $@ $(DEL) $@
 	@echo -P >> $@
@@ -72,6 +72,7 @@ install :: nlms FORCE
 clean ::
 	$(CHK) nw_export.i                                  $(DEL) nw_export.i
 	$(CHK) cc.opt                                       $(DEL) cc.opt
+	$(CHK) NWGNUversion.inc                             $(DEL) NWGNUversion.inc
 	$(CHK) $(subst /,\,$(APR))\include\apr.h            $(DEL) $(subst /,\,$(APR))\include\apr.h
 	$(CHK) $(subst /,\,$(APRUTIL))\include\apu.h        $(DEL) $(subst /,\,$(APRUTIL))\include\apu.h
 	$(CHK) $(subst /,\,$(APRUTIL))\include\apr_ldap.h   $(DEL) $(subst /,\,$(APRUTIL))\include\apr_ldap.h
diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index a5ed71ba22d..40c6069d584 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -50,6 +50,7 @@ $(NLM_NAME)_LINKOPT_DEPENDS	= \
 				NWGNUmakefile \
 				$(AP_WORK)\build\NWGNUtail.inc \
 				$(CUSTOM_INI) \
+				$(VERSION_INC) \
 				$(EOLIST)
 
 ifeq "$(words $(strip $(TARGET_lib)))" "1"
@@ -77,6 +78,20 @@ endif
 # Generic compiler rules
 #
 
+$(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\include\ap_release.h $(AP_WORK)\build\nw_ver.awk
+	@echo Generating $(subst /,\,$@)
+	awk -f $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h > $(AP_WORK)\build\NWGNUversion.inc
+
+-include $(AP_WORK)\build\NWGNUversion.inc
+
+ifneq "$(strip $(VERSION_STR))" ""
+VERSION_INC = $(AP_WORK)\build\NWGNUversion.inc
+else
+VERSION		= 2,0,0
+VERSION_STR	= 2.0.0
+endif
+
+
 $(OBJDIR)/%.o: %.c $(OBJDIR)\cc.opt
 	@echo Compiling $<
 	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
@@ -279,7 +294,7 @@ else # more than one target so look for individual makefiles.
 
 ifndef NO_LICENSE_FILE
 
-$(OBJDIR)/%.nlm: NWGNU% $(AP_WORK)\build\NWGNUhead.inc $(AP_WORK)\build\NWGNUtail.inc $(AP_WORK)\build\NWGNUenvironment.inc $(CUSTOM_INI) FORCE
+$(OBJDIR)/%.nlm: NWGNU% $(AP_WORK)\build\NWGNUhead.inc $(AP_WORK)\build\NWGNUtail.inc $(AP_WORK)\build\NWGNUenvironment.inc $(CUSTOM_INI) $(VERSION_INC) FORCE
 	@echo Calling $<
 	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
 	$(CMD) echo.