httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1332842 - in /httpd/httpd: branches/2.2.x/build/NWGNUenvironment.inc branches/2.2.x/build/NWGNUmakefile branches/2.4.x/build/NWGNUenvironment.inc branches/2.4.x/build/NWGNUmakefile trunk/build/NWGNUenvironment.inc trunk/build/NWGNUmakefile
Date Tue, 01 May 2012 21:30:03 GMT
Author: fuankg
Date: Tue May  1 21:30:02 2012
New Revision: 1332842

URL: http://svn.apache.org/viewvc?rev=1332842&view=rev
Log:
NetWare build system: fixed var names.
Renamed wrong and misleading var names in makefiles.
No functional change.

Modified:
    httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.2.x/build/NWGNUmakefile
    httpd/httpd/branches/2.4.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.4.x/build/NWGNUmakefile
    httpd/httpd/trunk/build/NWGNUenvironment.inc
    httpd/httpd/trunk/build/NWGNUmakefile

Modified: httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc?rev=1332842&r1=1332841&r2=1332842&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc Tue May  1 21:30:02 2012
@@ -212,16 +212,16 @@ PLIB3S	= $(METROWERKS)/Novell Support/Me
 
 ifeq "$(OS)" "Windows_NT"
 # MetroWerks Win32 build flags to create build tools
-MWCW_MSL    = "$(METROWERKS)/MSL"
-MWCW_W32    = "$(METROWERKS)/Win32-x86 Support"
-HOST_CC     = $(WIN_CC)
-HOST_CFLAGS =  -O2 -gccinc -nodefaults -proc 586 -w off
-HOST_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
-HOST_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+MWCW_MSL         = "$(METROWERKS)/MSL"
+MWCW_W32         = "$(METROWERKS)/Win32-x86 Support"
+CC_FOR_BUILD     = $(WIN_CC)
+CFLAGS_FOR_BUILD =  -O2 -gccinc -nodefaults -proc 586 -w off
+CFLAGS_FOR_BUILD += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
+CFLAGS_FOR_BUILD += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
 else
 # GNUC build flags to create build tools
-HOST_CC     = gcc
-HOST_CFLAGS = -Wall -O2
+CC_FOR_BUILD     = gcc
+CFLAGS_FOR_BUILD = -Wall -O2
 endif
 
 # Base compile flags

Modified: httpd/httpd/branches/2.2.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUmakefile?rev=1332842&r1=1332841&r2=1332842&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUmakefile Tue May  1 21:30:02 2012
@@ -70,7 +70,7 @@ $(NWOS)/chartables.c: dftables.exe $(PCR
 
 %.exe: $(PCRE)/%.c $(PCRE)/config.h $(PCRE)/pcre.h
 	@echo $(DL)Creating Build Helper $@$(DL)
-	$(HOST_CC) $(HOST_CFLAGS) -DHAVE_CONFIG_H $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DHAVE_CONFIG_H $< -o $@
 
 $(NWOS)/test_char.h: gen_test_char.exe $(SERVER)/gen_test_char.c
 	@echo $(DL)GEN  $@$(DL)
@@ -78,7 +78,7 @@ $(NWOS)/test_char.h: gen_test_char.exe $
 
 %.exe: $(SERVER)/%.c
 	@echo $(DL)Creating Build Helper $@$(DL)
-	$(HOST_CC) $(HOST_CFLAGS) -DCROSS_COMPILE $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE $< -o $@
 
 else
 

Modified: httpd/httpd/branches/2.4.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/NWGNUenvironment.inc?rev=1332842&r1=1332841&r2=1332842&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.4.x/build/NWGNUenvironment.inc Tue May  1 21:30:02 2012
@@ -212,16 +212,16 @@ PLIB3S	= $(METROWERKS)/Novell Support/Me
 
 ifeq "$(OS)" "Windows_NT"
 # MetroWerks Win32 build flags to create build tools
-MWCW_MSL    = "$(METROWERKS)/MSL"
-MWCW_W32    = "$(METROWERKS)/Win32-x86 Support"
-HOST_CC     = $(WIN_CC)
-HOST_CFLAGS =  -O2 -gccinc -nodefaults -proc 586 -w off
-HOST_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
-HOST_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+MWCW_MSL         = "$(METROWERKS)/MSL"
+MWCW_W32         = "$(METROWERKS)/Win32-x86 Support"
+CC_FOR_BUILD     = $(WIN_CC)
+CFLAGS_FOR_BUILD =  -O2 -gccinc -nodefaults -proc 586 -w off
+CFLAGS_FOR_BUILD += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
+CFLAGS_FOR_BUILD += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
 else
 # GNUC build flags to create build tools
-HOST_CC     = gcc
-HOST_CFLAGS = -Wall -O2
+CC_FOR_BUILD     = gcc
+CFLAGS_FOR_BUILD = -Wall -O2
 endif
 
 # Base compile flags

Modified: httpd/httpd/branches/2.4.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/NWGNUmakefile?rev=1332842&r1=1332841&r2=1332842&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.4.x/build/NWGNUmakefile Tue May  1 21:30:02 2012
@@ -79,7 +79,7 @@ $(NWOS)/chartables.c: dftables.exe $(PCR
 
 %.exe: $(PCRE)/%.c $(PCRE)/config.h $(PCRE)/pcre.h
 	@echo $(DL)Creating Build Helper $@$(DL)
-	$(HOST_CC) $(HOST_CFLAGS) -DHAVE_CONFIG_H $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DHAVE_CONFIG_H $< -o $@
 
 $(NWOS)/test_char.h: gen_test_char.exe $(SERVER)/gen_test_char.c
 	@echo $(DL)GEN  $@$(DL)
@@ -87,7 +87,7 @@ $(NWOS)/test_char.h: gen_test_char.exe $
 
 %.exe: $(SERVER)/%.c
 	@echo $(DL)Creating Build Helper $@$(DL)
-	$(HOST_CC) $(HOST_CFLAGS) -DCROSS_COMPILE $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE $< -o $@
 
 else
 

Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=1332842&r1=1332841&r2=1332842&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Tue May  1 21:30:02 2012
@@ -212,16 +212,16 @@ PLIB3S	= $(METROWERKS)/Novell Support/Me
 
 ifeq "$(OS)" "Windows_NT"
 # MetroWerks Win32 build flags to create build tools
-MWCW_MSL    = "$(METROWERKS)/MSL"
-MWCW_W32    = "$(METROWERKS)/Win32-x86 Support"
-HOST_CC     = $(WIN_CC)
-HOST_CFLAGS =  -O2 -gccinc -nodefaults -proc 586 -w off
-HOST_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
-HOST_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+MWCW_MSL         = "$(METROWERKS)/MSL"
+MWCW_W32         = "$(METROWERKS)/Win32-x86 Support"
+CC_FOR_BUILD     = $(WIN_CC)
+CFLAGS_FOR_BUILD =  -O2 -gccinc -nodefaults -proc 586 -w off
+CFLAGS_FOR_BUILD += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
+CFLAGS_FOR_BUILD += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
 else
 # GNUC build flags to create build tools
-HOST_CC     = gcc
-HOST_CFLAGS = -Wall -O2
+CC_FOR_BUILD     = gcc
+CFLAGS_FOR_BUILD = -Wall -O2
 endif
 
 # Base compile flags

Modified: httpd/httpd/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUmakefile?rev=1332842&r1=1332841&r2=1332842&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUmakefile (original)
+++ httpd/httpd/trunk/build/NWGNUmakefile Tue May  1 21:30:02 2012
@@ -79,7 +79,7 @@ $(NWOS)/chartables.c: dftables.exe $(PCR
 
 %.exe: $(PCRE)/%.c $(PCRE)/config.h $(PCRE)/pcre.h
 	@echo $(DL)Creating Build Helper $@$(DL)
-	$(HOST_CC) $(HOST_CFLAGS) -DHAVE_CONFIG_H $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DHAVE_CONFIG_H $< -o $@
 
 $(NWOS)/test_char.h: gen_test_char.exe $(SERVER)/gen_test_char.c
 	@echo $(DL)GEN  $@$(DL)
@@ -87,7 +87,7 @@ $(NWOS)/test_char.h: gen_test_char.exe $
 
 %.exe: $(SERVER)/%.c
 	@echo $(DL)Creating Build Helper $@$(DL)
-	$(HOST_CC) $(HOST_CFLAGS) -DCROSS_COMPILE $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE $< -o $@
 
 else
 



Mime
View raw message