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/modules/proxy NWGNUproxy NWGNUproxyftp NWGNUproxyhtp
Date Sun, 07 Mar 2004 03:04:51 GMT
bnicholes    2004/03/06 19:04:51

  Modified:    .        NWGNUmakefile
               build    NWGNUtail.inc
               modules/dav/fs NWGNUmakefile
               modules/filters NWGNUdeflate
               modules/metadata NWGNUuniqueid
               modules/proxy NWGNUproxy NWGNUproxyftp NWGNUproxyhtp
  Log:
  Allow make files to create a cc.opt compiler options file per NLM rather than a single file
per directory
  
  Revision  Changes    Path
  1.22      +24 -24    httpd-2.0/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/NWGNUmakefile,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- NWGNUmakefile	6 Mar 2004 22:22:38 -0000	1.21
  +++ NWGNUmakefile	7 Mar 2004 03:04:51 -0000	1.22
  @@ -348,53 +348,53 @@
   # Any specialized rules here
   #
   
  -$(OBJDIR)/%.o: server/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: server/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
   #
   # Include the 'tail' makefile that has targets that depend on variables defined
  
  
  
  1.8       +9 -3      httpd-2.0/build/NWGNUtail.inc
  
  Index: NWGNUtail.inc
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/NWGNUtail.inc,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- NWGNUtail.inc	1 Jan 2004 13:26:16 -0000	1.7
  +++ NWGNUtail.inc	7 Mar 2004 03:04:51 -0000	1.8
  @@ -96,11 +96,13 @@
   endif
   
   
  -$(OBJDIR)/%.o: %.c $(OBJDIR)\cc.opt
  +ifeq "$(words $(strip $(TARGET_nlm)))" "1"
  +
  +$(OBJDIR)/%.o: %.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)\cc.opt: $(CCOPT_DEPENDS)
  +$(OBJDIR)\$(NLM_NAME)_cc.opt: $(CCOPT_DEPENDS)
   	$(CHK) $@ $(DEL) $@
   	@echo Generating $@
   ifneq "$(strip $(CFLAGS))" ""
  @@ -148,6 +150,8 @@
   	@echo $(XDEFINES) >> $@
   endif
   
  +endif # one target nlm
  +
   #
   # Rules to build libraries
   #
  @@ -188,6 +192,8 @@
   $(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
  
  
  
  1.5       +3 -2      httpd-2.0/modules/dav/fs/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/fs/NWGNUmakefile,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NWGNUmakefile	6 Feb 2003 19:15:29 -0000	1.4
  +++ NWGNUmakefile	7 Mar 2004 03:04:51 -0000	1.5
  @@ -32,6 +32,7 @@
   			$(AP_WORK)/server/mpm/NetWare \
   			$(AP_WORK)/srclib/pcre \
   			$(AP_WORK)/modules/dav/main \
  +			$(AP_WORK)/modules/arch/netware \
   			$(NWOS) \
   			$(EOLIST)
   
  @@ -256,9 +257,9 @@
   # Any specialized rules here
   #
   
  -$(OBJDIR)/%.o: ../../arch/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: ../../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
   #
   # Include the 'tail' makefile that has targets that depend on variables defined
  
  
  
  1.6       +2 -2      httpd-2.0/modules/filters/NWGNUdeflate
  
  Index: NWGNUdeflate
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/NWGNUdeflate,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NWGNUdeflate	26 Nov 2002 00:13:50 -0000	1.5
  +++ NWGNUdeflate	7 Mar 2004 03:04:51 -0000	1.6
  @@ -265,9 +265,9 @@
   #
   
   ifneq "$(ZLIBSDK)" ""
  -$(OBJDIR)/%.o: $(ZLIBSDK)/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: $(ZLIBSDK)/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) $(ZLIBSDK)\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $(ZLIBSDK)\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   endif
   
   #
  
  
  
  1.4       +2 -2      httpd-2.0/modules/metadata/NWGNUuniqueid
  
  Index: NWGNUuniqueid
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/NWGNUuniqueid,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NWGNUuniqueid	16 Oct 2002 23:52:26 -0000	1.3
  +++ NWGNUuniqueid	7 Mar 2004 03:04:51 -0000	1.4
  @@ -243,9 +243,9 @@
   # Any specialized rules here
   #
   
  -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
   #
   # Include the 'tail' makefile that has targets that depend on variables defined
  
  
  
  1.6       +2 -2      httpd-2.0/modules/proxy/NWGNUproxy
  
  Index: NWGNUproxy
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxy,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NWGNUproxy	6 Mar 2004 22:26:51 -0000	1.5
  +++ NWGNUproxy	7 Mar 2004 03:04:51 -0000	1.6
  @@ -251,9 +251,9 @@
   # Any specialized rules here
   #
   
  -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
   #
   # Include the 'tail' makefile that has targets that depend on variables defined
  
  
  
  1.6       +2 -2      httpd-2.0/modules/proxy/NWGNUproxyftp
  
  Index: NWGNUproxyftp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxyftp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NWGNUproxyftp	6 Feb 2003 19:15:29 -0000	1.5
  +++ NWGNUproxyftp	7 Mar 2004 03:04:51 -0000	1.6
  @@ -249,9 +249,9 @@
   # Any specialized rules here
   #
   
  -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
   #
   # Include the 'tail' makefile that has targets that depend on variables defined
  
  
  
  1.6       +2 -2      httpd-2.0/modules/proxy/NWGNUproxyhtp
  
  Index: NWGNUproxyhtp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxyhtp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NWGNUproxyhtp	6 Feb 2003 19:15:29 -0000	1.5
  +++ NWGNUproxyhtp	7 Mar 2004 03:04:51 -0000	1.6
  @@ -252,9 +252,9 @@
   # Any specialized rules here
   #
   
  -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo compiling $<
  -	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
   #
   # Include the 'tail' makefile that has targets that depend on variables defined
  
  
  

Mime
View raw message