Commit 2c8344f1 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Allow APR to exist and build outside of the httpd/srclib file structure 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
parent d096bd0a

NWGNUmakefile

+3 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



SUBDIRS = \

	srclib\apr \

	$(APR_WORK) \

	build \

	support \

	modules \
@@ -28,9 +28,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/ \

build/NWGNUenvironment.inc

+4 −4
Original line number Diff line number Diff line
@@ -269,11 +269,11 @@ 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		= $(APR_WORK)/../apr-util

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

build/NWGNUmakefile

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NW 
	@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_WORK)\include >> $@

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

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



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

modules/aaa/NWGNUauthbasc

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ XINCDIRS += \ 
			$(AP_WORK)/include \

			$(NWOS) \

			$(AP_WORK)/modules/arch/netware \

			$(AP_WORK)/srclib/apr/include \

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

			$(AP_WORK)/srclib/apr \

			$(APR)/include \

			$(APRUTIL)/include \

			$(APR) \

			$(EOLIST)



#

modules/aaa/NWGNUauthdigt

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ XINCDIRS += \ 
			$(AP_WORK)/include \

			$(NWOS) \

			$(AP_WORK)/modules/arch/netware \

			$(AP_WORK)/srclib/apr/include \

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

			$(AP_WORK)/srclib/apr \

			$(APR)/include \

			$(APRUTIL)/include \

			$(APR) \

			$(EOLIST)



#