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 NWGNUmakefile NWGNUtail.inc
Date Mon, 12 Apr 2004 20:50:55 GMT
bnicholes    2004/04/12 13:50:55

  Modified:    .        Tag: APACHE_2_0_BRANCH NWGNUmakefile
               build    Tag: APACHE_2_0_BRANCH NWGNUmakefile NWGNUtail.inc
               modules/aaa Tag: APACHE_2_0_BRANCH NWGNUdigest
               modules/dav/fs Tag: APACHE_2_0_BRANCH NWGNUmakefile
               modules/filters Tag: APACHE_2_0_BRANCH NWGNUdeflate
               modules/metadata Tag: APACHE_2_0_BRANCH NWGNUuniqueid
               modules/proxy Tag: APACHE_2_0_BRANCH NWGNUproxy
                        NWGNUproxyftp NWGNUproxyhtp
               .        Tag: APU_0_9_BRANCH NWGNUmakefile
               xml      Tag: APU_0_9_BRANCH NWGNUmakefile
               .        Tag: APR_0_9_BRANCH NWGNUmakefile
               build    Tag: APR_0_9_BRANCH NWGNUmakefile NWGNUtail.inc
  Log:
  Allow make files to create a cc.opt compiler options file per NLM rather than a single file
per directory
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.13.2.11 +24 -24    httpd-2.0/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/NWGNUmakefile,v
  retrieving revision 1.13.2.10
  retrieving revision 1.13.2.11
  diff -u -r1.13.2.10 -r1.13.2.11
  --- NWGNUmakefile	6 Apr 2004 22:49:23 -0000	1.13.2.10
  +++ NWGNUmakefile	12 Apr 2004 20:50:54 -0000	1.13.2.11
  @@ -350,53 +350,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
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +4 -4      httpd-2.0/build/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/NWGNUmakefile,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- NWGNUmakefile	16 Oct 2002 23:50:01 -0000	1.3
  +++ NWGNUmakefile	12 Apr 2004 20:50:54 -0000	1.3.2.1
  @@ -29,11 +29,11 @@
   	@echo Generating $(subst /,\,$@)
   	awk -f make_nw_export.awk nw_export.i | sort >$(NWOS)/httpd.imp
       
  -nw_export.i : nw_export.inc $(FILES_prebuild_headers) cc.opt
  +nw_export.i : nw_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
   	@echo Generating $(subst /,\,$@)
  -	$(CC) $< @cc.opt
  +	$(CC) $< @$(NLM_NAME)_cc.opt
   	
  -cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NWGNUtail.inc
$(AP_WORK)\build\NWGNUhead.inc
  +$(NLM_NAME)_cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NWGNUtail.inc
$(AP_WORK)\build\NWGNUhead.inc
   	$(CHK) $@ $(DEL) $@
   	@echo -P >> $@
   	@echo -EP >> $@
  @@ -71,7 +71,7 @@
   
   clean ::
   	$(CHK) nw_export.i                                  $(DEL) nw_export.i
  -	$(CHK) cc.opt                                       $(DEL) cc.opt
  +	$(CHK) $(NLM_NAME)_cc.opt                           $(DEL) $(NLM_NAME)_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
  
  
  
  1.4.2.4   +7 -3      httpd-2.0/build/NWGNUtail.inc
  
  Index: NWGNUtail.inc
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/NWGNUtail.inc,v
  retrieving revision 1.4.2.3
  retrieving revision 1.4.2.4
  diff -u -r1.4.2.3 -r1.4.2.4
  --- NWGNUtail.inc	1 Jan 2004 13:30:37 -0000	1.4.2.3
  +++ NWGNUtail.inc	12 Apr 2004 20:50:54 -0000	1.4.2.4
  @@ -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))" ""
  @@ -147,6 +149,8 @@
   ifneq "$(strip $(XDEFINES))" ""
   	@echo $(XDEFINES) >> $@
   endif
  +
  +endif # one target nlm
   
   #
   # Rules to build libraries
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -0      httpd-2.0/modules/aaa/Attic/NWGNUdigest
  
  Index: NWGNUdigest
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/Attic/NWGNUdigest,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- NWGNUdigest	1 Mar 2002 22:21:25 -0000	1.1
  +++ NWGNUdigest	12 Apr 2004 20:50:54 -0000	1.1.2.1
  @@ -16,6 +16,7 @@
   # INCDIRS
   #
   XINCDIRS	+= \
  +			$(AP_WORK)/include \
   			$(NWOS) \
   			$(AP_WORK)/modules/arch/netware \
   			$(AP_WORK)/srclib/apr/include \
  
  
  
  No                   revision
  No                   revision
  1.3.2.2   +2 -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.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- NWGNUmakefile	6 Feb 2003 19:12:39 -0000	1.3.2.1
  +++ NWGNUmakefile	12 Apr 2004 20:50:54 -0000	1.3.2.2
  @@ -256,9 +256,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
  
  
  
  No                   revision
  No                   revision
  1.4.2.2   +2 -2      httpd-2.0/modules/filters/NWGNUdeflate
  
  Index: NWGNUdeflate
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/NWGNUdeflate,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- NWGNUdeflate	2 Dec 2002 15:39:40 -0000	1.4.2.1
  +++ NWGNUdeflate	12 Apr 2004 20:50:54 -0000	1.4.2.2
  @@ -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
   
   #
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +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.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- NWGNUuniqueid	16 Oct 2002 23:52:26 -0000	1.3
  +++ NWGNUuniqueid	12 Apr 2004 20:50:54 -0000	1.3.2.1
  @@ -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
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +2 -2      httpd-2.0/modules/proxy/NWGNUproxy
  
  Index: NWGNUproxy
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxy,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- NWGNUproxy	16 Oct 2002 23:52:27 -0000	1.4
  +++ NWGNUproxy	12 Apr 2004 20:50:54 -0000	1.4.2.1
  @@ -250,9 +250,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.4.2.2   +2 -2      httpd-2.0/modules/proxy/NWGNUproxyftp
  
  Index: NWGNUproxyftp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxyftp,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- NWGNUproxyftp	6 Feb 2003 19:12:39 -0000	1.4.2.1
  +++ NWGNUproxyftp	12 Apr 2004 20:50:54 -0000	1.4.2.2
  @@ -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.4.2.2   +2 -2      httpd-2.0/modules/proxy/NWGNUproxyhtp
  
  Index: NWGNUproxyhtp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxyhtp,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- NWGNUproxyhtp	6 Feb 2003 19:12:39 -0000	1.4.2.1
  +++ NWGNUproxyhtp	12 Apr 2004 20:50:54 -0000	1.4.2.2
  @@ -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
  
  
  
  No                   revision
  No                   revision
  1.7.2.1   +22 -22    apr-util/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/apr-util/NWGNUmakefile,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- NWGNUmakefile	13 Sep 2002 21:46:19 -0000	1.7
  +++ NWGNUmakefile	12 Apr 2004 20:50:54 -0000	1.7.2.1
  @@ -275,49 +275,49 @@
   # Any specialized rules here
   #
   
  -$(OBJDIR)/%.o: buckets/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: buckets/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) buckets\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) buckets\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   	
  -$(OBJDIR)/%.o: crypto/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: crypto/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) crypto\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) crypto\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: dbm/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: dbm/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) dbm\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt	
  +	$(CC) dbm\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt	
   
  -$(OBJDIR)/%.o: dbm/sdbm/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: dbm/sdbm/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) dbm\sdbm\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) dbm\sdbm\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: encoding/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: encoding/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) encoding\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) encoding\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: hooks/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: hooks/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) hooks\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) hooks\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: misc/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: misc/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) misc\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) misc\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: strmatch/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: strmatch/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) strmatch\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) strmatch\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: uri/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: uri/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) uri\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) uri\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: xlate/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: xlate/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) xlate\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) xlate\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   	
  -$(OBJDIR)/%.o: xml/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: xml/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) xml\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) xml\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
   
   #
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +2 -2      apr-util/xml/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/NWGNUmakefile,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- NWGNUmakefile	1 Mar 2002 22:23:57 -0000	1.1
  +++ NWGNUmakefile	12 Apr 2004 20:50:54 -0000	1.1.2.1
  @@ -247,9 +247,9 @@
   # Any specialized rules here
   #
   
  -$(OBJDIR)/%.o: expat/lib/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: expat/lib/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) expat/lib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) expat/lib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
   
   
  
  
  
  No                   revision
  No                   revision
  1.16.2.4  +42 -42    apr/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/apr/NWGNUmakefile,v
  retrieving revision 1.16.2.3
  retrieving revision 1.16.2.4
  diff -u -r1.16.2.3 -r1.16.2.4
  --- NWGNUmakefile	6 Apr 2004 22:49:23 -0000	1.16.2.3
  +++ NWGNUmakefile	12 Apr 2004 20:50:54 -0000	1.16.2.4
  @@ -344,89 +344,89 @@
   # Any specialized rules here
   #
   
  -$(OBJDIR)/%.o: strings/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: strings/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) strings\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) strings\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: tables/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: tables/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) tables\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) tables\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: passwd/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: passwd/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) passwd\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) passwd\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: lib/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: lib/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) lib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) lib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: time/unix/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: time/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) time\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) time\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) file_io\netware\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) file_io\netware\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: file_io/unix/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: file_io/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) file_io\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) file_io\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: locks/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: locks/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) locks\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) locks\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: misc/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: misc/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) misc\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) misc\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: misc/unix/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: misc/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) misc\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) misc\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: threadproc/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: threadproc/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) threadproc\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) threadproc\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: dso/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: dso/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) dso\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) dso\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: memory/unix/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: memory/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) memory\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) memory\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: mmap/unix/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: mmap/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) mmap\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) mmap\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: user/netware/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: user/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) user\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) user\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: network_io/win32/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: network_io/win32/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) network_io\win32\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) network_io\win32\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: network_io/unix/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: network_io/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) network_io\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) network_io\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   	
  -$(OBJDIR)/%.o: poll/unix/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: poll/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) poll\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) poll\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: file_io/os2/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: file_io/os2/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) file_io\os2\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) file_io\os2\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: shmem/unix/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: shmem/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) shmem\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) shmem\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
  -$(OBJDIR)/%.o: support/unix/%.c $(OBJDIR)\cc.opt
  +$(OBJDIR)/%.o: support/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  -	$(CC) support\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	$(CC) support\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
   
   #
   # Include the 'tail' makefile that has targets that depend on variables defined
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +4 -4      apr/build/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/apr/build/NWGNUmakefile,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- NWGNUmakefile	25 Aug 2003 18:17:36 -0000	1.3
  +++ NWGNUmakefile	12 Apr 2004 20:50:55 -0000	1.3.2.1
  @@ -32,11 +32,11 @@
   	@echo Generating $(subst /,\,$@)
   	awk -f make_nw_export.awk nw_export.i | sort >$(APR)/aprlib.imp
       
  -nw_export.i : nw_export.inc $(FILES_prebuild_headers) cc.opt
  +nw_export.i : nw_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
   	@echo Generating $(subst /,\,$@)
  -	$(CC) $< @cc.opt
  +	$(CC) $< @$(NLM_NAME)_cc.opt
   
  -cc.opt : NWGNUmakefile $(APR_WORK)\build\NWGNUenvironment.inc $(APR_WORK)\build\NWGNUhead.inc
$(APR_WORK)\build\NWGNUtail.inc $(CUSTOM_INI)
  +$(NLM_NAME)_cc.opt : NWGNUmakefile $(APR_WORK)\build\NWGNUenvironment.inc $(APR_WORK)\build\NWGNUhead.inc
$(APR_WORK)\build\NWGNUtail.inc $(CUSTOM_INI)
   	$(CHK) $@ $(DEL) $@
   	@echo -P >> $@
   	@echo -EP >> $@
  @@ -78,7 +78,7 @@
   
   clean ::
   	$(CHK) nw_export.i                                              $(DEL) nw_export.i
  -	$(CHK) cc.opt                                                   $(DEL) cc.opt
  +	$(CHK) $(NLM_NAME)_cc.opt                                       $(DEL) $(NLM_NAME)_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
  
  
  
  1.6.2.1   +8 -4      apr/build/NWGNUtail.inc
  
  Index: NWGNUtail.inc
  ===================================================================
  RCS file: /home/cvs/apr/build/NWGNUtail.inc,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- NWGNUtail.inc	22 May 2003 19:15:29 -0000	1.6
  +++ NWGNUtail.inc	12 Apr 2004 20:50:55 -0000	1.6.2.1
  @@ -25,7 +25,7 @@
   endif
   
   ifndef NLM_COPYRIGHT
  -NLM_COPYRIGHT = Copyright (c) 2000-2003 The Apache Software Foundation. All rights reserved.
  +NLM_COPYRIGHT = Copyright (c) 2000-2004 The Apache Software Foundation. All rights reserved.
   endif
   
   #
  @@ -97,11 +97,13 @@
   endif
   
   
  -$(OBJDIR)/%.o: %.c $(OBJDIR)\cc.opt
  +ifeq "$(words $(strip $(TARGET_lib)))" "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)
   	@echo CCOPT_DEPENDS=$(CCOPT_DEPENDS)
   	$(CHK) $@ $(DEL) $@
   	@echo Generating $@
  @@ -149,6 +151,8 @@
   ifneq "$(strip $(XDEFINES))" ""
   	@echo $(XDEFINES) >> $@
   endif
  +
  +endif # one target nlm
   
   #
   # Rules to build libraries
  
  
  

Mime
View raw message