From: Guenter Knauf Date: Tue, 1 May 2012 21:30:02 +0000 (+0000) Subject: NetWare build system: fixed var names. X-Git-Tag: 2.5.0-alpha~6920 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a13032e90ad7f26fcca2f0bdc9fbea5cae1d757;p=thirdparty%2Fapache%2Fhttpd.git NetWare build system: fixed var names. Renamed wrong and misleading var names in makefiles. No functional change. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1332842 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 162365c16fe..d3fa6605007 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -212,16 +212,16 @@ PLIB3S = $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++/MWCPP 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 diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index a230bfa3eca..1954257eb57 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -79,7 +79,7 @@ $(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c %.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 $(SERVER)/gen_test_char.c %.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