apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: apr/build NWGNUtail.inc
Date Wed, 28 Apr 2004 20:40:22 GMT
bnicholes    2004/04/28 13:40:22

  Modified:    build    NWGNUtail.inc
               modules/dav/fs NWGNUmakefile
               modules/dav/lock NWGNUmakefile
               build    NWGNUtail.inc
  Log:
  Fix the XLFLAGS define in the NetWare makefiles so that the contents are added to the _link.opt
file rather than the _link.def file
  
  Submitted by: Guenter Knauf <gk@gknw.net>, Brad Nicholes
  
  Revision  Changes    Path
  1.9       +3 -5      httpd-2.0/build/NWGNUtail.inc
  
  Index: NWGNUtail.inc
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/NWGNUtail.inc,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- NWGNUtail.inc	7 Mar 2004 03:04:51 -0000	1.8
  +++ NWGNUtail.inc	28 Apr 2004 20:40:22 -0000	1.9
  @@ -192,8 +192,6 @@
   $(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)\$(NLM_NAME)_link.opt
   	@echo Linking $@
   	$(LINK) @$(OBJDIR)\$(NLM_NAME)_link.opt
  -        
  -#	$(CHK) $(OBJDIR)\cc.opt $(DEL) $(OBJDIR)\cc.opt
   
   # This will force the link option file to be rebuilt if we change the
   # corresponding makefile
  @@ -264,6 +262,9 @@
   ifneq "$(NLM_FLAGS)" ""
   	@echo -flags $(NLM_FLAGS) >> $@
   endif
  +ifneq "$(strip $(XLFLAGS))" ""
  +	@echo $(XLFLAGS) >> $@
  +endif
   ifneq "$(strip $(FILES_nlm_objs))" ""
   	@echo $(foreach objfile,$(strip $(FILES_nlm_objs)),$(subst /,\,$(objfile))) >> $@
   endif
  @@ -285,9 +286,6 @@
   endif
   ifneq "$(FILES_nlm_exports)" ""
   	@echo Export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst
/,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def
  -endif
  -ifneq "$(strip $(XLFLAGS))" ""
  -	@echo $(XLFLAGS) >> $(OBJDIR)\$(NLM_NAME)_link.def
   endif
   
   # if APACHE_UNIPROC is defined, don't include XDCData
  
  
  
  1.6       +0 -1      httpd-2.0/modules/dav/fs/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/fs/NWGNUmakefile,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NWGNUmakefile	7 Mar 2004 03:04:51 -0000	1.5
  +++ NWGNUmakefile	28 Apr 2004 20:40:22 -0000	1.6
  @@ -52,7 +52,6 @@
   # These flags will be added to the link.opt file
   #
   XLFLAGS		+= \
  -			XDCData $(NWOS)\apache.xdc \
   			$(EOLIST)
   
   #
  
  
  
  1.3       +0 -1      httpd-2.0/modules/dav/lock/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/lock/NWGNUmakefile,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NWGNUmakefile	6 Feb 2003 19:15:29 -0000	1.2
  +++ NWGNUmakefile	28 Apr 2004 20:40:22 -0000	1.3
  @@ -51,7 +51,6 @@
   # These flags will be added to the link.opt file
   #
   XLFLAGS		+= \
  -			XDCData $(NWOS)\apache.xdc \
   			$(EOLIST)
   
   #
  
  
  
  1.10      +3 -3      apr/build/NWGNUtail.inc
  
  Index: NWGNUtail.inc
  ===================================================================
  RCS file: /home/cvs/apr/build/NWGNUtail.inc,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- NWGNUtail.inc	13 Apr 2004 20:25:12 -0000	1.9
  +++ NWGNUtail.inc	28 Apr 2004 20:40:22 -0000	1.10
  @@ -253,6 +253,9 @@
   ifneq "$(NLM_FLAGS)" ""
   	@echo -flags $(NLM_FLAGS) >> $@
   endif
  +ifneq "$(strip $(XLFLAGS))" ""
  +	@echo $(XLFLAGS) >> $@
  +endif
   ifneq "$(strip $(FILES_nlm_objs))" ""
   	@echo $(foreach objfile,$(strip $(FILES_nlm_objs)),$(subst /,\,$(objfile))) >> $@
   endif
  @@ -274,9 +277,6 @@
   endif
   ifneq "$(FILES_nlm_exports)" ""
   	@echo Export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst
/,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def
  -endif
  -ifneq "$(strip $(XLFLAGS))" ""
  -	@echo $(XLFLAGS) >> $(OBJDIR)\$(NLM_NAME)_link.def
   endif
   
   # if APACHE_UNIPROC is defined, don't include XDCData
  
  
  

Mime
View raw message