httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/build NWGNUtail.inc NWGNUmakefile NWGNUenvironment.inc
Date Wed, 16 Oct 2002 23:50:01 GMT
bnicholes    2002/10/16 16:50:01

  Modified:    build    NWGNUtail.inc NWGNUmakefile NWGNUenvironment.inc
  Log:
  General make file changes to extract the version string and
  create NWGNUversion.inc
  
  Revision  Changes    Path
  1.4       +16 -1     httpd-2.0/build/NWGNUtail.inc
  
  Index: NWGNUtail.inc
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/NWGNUtail.inc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NWGNUtail.inc	26 Sep 2002 20:17:16 -0000	1.3
  +++ NWGNUtail.inc	16 Oct 2002 23:50:01 -0000	1.4
  @@ -50,6 +50,7 @@
   				NWGNUmakefile \
   				$(AP_WORK)\build\NWGNUtail.inc \
   				$(CUSTOM_INI) \
  +				$(VERSION_INC) \
   				$(EOLIST)
   
   ifeq "$(words $(strip $(TARGET_lib)))" "1"
  @@ -77,6 +78,20 @@
   # 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 @@
   
   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.
  
  
  
  1.3       +2 -1      httpd-2.0/build/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/NWGNUmakefile,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NWGNUmakefile	16 Sep 2002 21:22:08 -0000	1.2
  +++ NWGNUmakefile	16 Oct 2002 23:50:01 -0000	1.3
  @@ -32,7 +32,7 @@
   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 @@
   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
  
  
  
  1.9       +0 -1      httpd-2.0/build/NWGNUenvironment.inc
  
  Index: NWGNUenvironment.inc
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/NWGNUenvironment.inc,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- NWGNUenvironment.inc	11 Oct 2002 21:35:06 -0000	1.8
  +++ NWGNUenvironment.inc	16 Oct 2002 23:50:01 -0000	1.9
  @@ -278,7 +278,6 @@
   #
   # Additional general defines
   #
  -VERSION		= 2,0,0
   
   EnvironmentDefined = 1
   endif # ifndef EnvironmentDefined
  
  
  

Mime
View raw message