Commit 8c84c2e0 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Cleaned up NetWare makefiles: 

- removed obsolete -prefix compiler switch since already defined global for all files
- removed obsolete include paths
- changed include paths to use internal vars so hat apr/apr-util builds outside source tree
- removed trailing tabs and spaces, other minor cosmetic changes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@966915 13f79535-47bb-0310-9956-ffa450edef68
parent 4b8fe3ab

NWGNUmakefile

+35 −6
Changes for NWGNUmakefile: 35 added lines, 6 removed lines.
Original line number Diff line number Diff line 
#

# Define our required macro's if not already done.

#



ifndef AP_WORK

export AP_WORK = $(CURDIR)

endif



ifndef APR_WORK

ifeq "$(wildcard $(AP_WORK)/srclib/apr)" "$(AP_WORK)/srclib/apr"

export APR_WORK = $(AP_WORK)/srclib/apr

endif

endif

ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h"

$(error APR_WORK does not point to a valid APR source tree) 

endif



ifndef APU_WORK

ifeq "$(wildcard $(AP_WORK)/srclib/apr-util)" "$(AP_WORK)/srclib/apr-util"

export APU_WORK = $(AP_WORK)/srclib/apr-util

endif

endif

ifndef APU_WORK

ifeq "$(wildcard $(APR_WORK)/include/apu_version.h)" "$(APR_WORK)/include/apu_version.h"

export APU_WORK = $(APR_WORK)

endif

endif

ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h"

$(error APU_WORK does not point to a valid APU source tree) 

endif



#

# Declare the sub-directories to be built here

#



SUBDIRS = \

	srclib\apr \

	$(APR_WORK) \

	build \

	support \

	modules \
@@ -28,9 +59,8 @@ include $(AP_WORK)\build\NWGNUhead.inc 
# INCDIRS

#

XINCDIRS	+= \

			$(AP_WORK)/srclib/apr/include \

			$(AP_WORK)/srclib/include/arch/NetWare \

			$(AP_WORK)/srclib/apr-util/include \

			$(APR)/include \

			$(APRUTIL)/include \

			$(AP_WORK)/include \

			$(AP_WORK)/modules/filters/ \

			$(AP_WORK)/modules/generators/ \
@@ -38,9 +68,8 @@ XINCDIRS += \ 
			$(AP_WORK)/modules/loggers/ \

			$(AP_WORK)/modules/mappers/ \

			$(AP_WORK)/modules/proxy/ \

			$(AP_WORK)/os/NetWare \

			$(AP_WORK)/server/mpm/NetWare \

			$(AP_WORK)/srclib/pcre \

			$(PCRE) \

			$(NWOS) \

			$(EOLIST)

build/NWGNUenvironment.inc

+4 −4
Changes for build/NWGNUenvironment.inc: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -272,13 +272,13 @@ STDMOD = $(AP_WORK)/modules 
NWOS		= $(AP_WORK)/os/netware

SERVER		= $(AP_WORK)/server

SRC		= $(AP_WORK)

APR			= $(AP_WORK)/srclib/apr

APRUTIL		= $(AP_WORK)/srclib/apr-util

APR		= $(APR_WORK)

APRUTIL		= $(APU_WORK)

SUPMOD		= $(AP_WORK)/support

PCRE		= $(AP_WORK)/srclib/pcre

APRTEST		= $(AP_WORK)/srclib/apr/test

APRTEST		= $(APR_WORK)/test

HTTPD		= $(AP_WORK)/modules/http

XML			= $(AP_WORK)/srclib/apr-util/xml

XML		= $(APU_WORK)/xml



#

# Internal Libraries

build/NWGNUmakefile

+2 −2
Changes for build/NWGNUmakefile: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ $(NLM_NAME)_cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WO 
	@echo -I..\modules\aaa >> $@

	@echo -I..\os\netware >> $@

	@echo -I..\server\mpm\netware >> $@

	@echo -I..\srclib\apr\include >> $@

	@echo -I..\srclib\apr-util\include >> $@

	@echo -I$(APR)\include >> $@

	@echo -I$(APRUTIL)\include >> $@

	@echo -ir $(NOVELLLIBC) >> $@



$(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw

modules/aaa/NWGNUauthanon

+3 −5
Changes for modules/aaa/NWGNUauthanon: 3 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -16,19 +16,16 @@ endif 
# INCDIRS

#

XINCDIRS	+= \

			$(APR)/include \

			$(APRUTIL)/include \

			$(AP_WORK)/include \

			$(NWOS) \

			$(AP_WORK)/modules/arch/netware \

			$(AP_WORK)/srclib/apr/include \

			$(AP_WORK)/srclib/apr-util/include \

			$(AP_WORK)/srclib/apr \

			$(EOLIST)



#

# These flags will come after CFLAGS

#

XCFLAGS		+= \

			-prefix pre_nw.h \

			$(EOLIST)



#
@@ -248,3 +245,4 @@ install :: nlms FORCE 


include $(AP_WORK)\build\NWGNUtail.inc

modules/aaa/NWGNUauthdbm

+3 −4
Changes for modules/aaa/NWGNUauthdbm: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -16,12 +16,10 @@ endif 
# INCDIRS

#

XINCDIRS	+= \

			$(APR)/include \

			$(APRUTIL)/include \

			$(AP_WORK)/include \

			$(NWOS) \

			$(AP_WORK)/modules/arch/netware \

			$(AP_WORK)/srclib/apr/include \

			$(AP_WORK)/srclib/apr-util/include \

			$(AP_WORK)/srclib/apr \

			$(EOLIST)



#
@@ -247,3 +245,4 @@ install :: nlms FORCE 


include $(AP_WORK)\build\NWGNUtail.inc