From: Bradley Nicholes <bnicholes@apache.org>
Date: Fri, 20 Aug 2004 17:10:18 +0000 (+0000)
Subject: Build using the ajp code in the proxy directory.
X-Git-Tag: STRIKER_2_1_0_RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64e770c7676ec45c00079632ada8872455e3ae50;p=apache

Build using the ajp code in the proxy directory.


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

diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile
index 7b54f94723..841673e473 100644
--- a/modules/proxy/NWGNUmakefile
+++ b/modules/proxy/NWGNUmakefile
@@ -157,15 +157,9 @@ TARGET_nlm = \
 	$(OBJDIR)/proxyftp.nlm \
 	$(OBJDIR)/proxyhtp.nlm \
 	$(OBJDIR)/proxybalancer.nlm \
+	$(OBJDIR)/proxyajp.nlm \
 	$(EOLIST)
 
-# If AJPLIB has been defined then build the proxyajp module
-ifneq "$(AJPLIB)" ""
-TARGET_nlm += $(OBJDIR)/proxyajp.nlm \
-	$(EOLIST)
-endif
-
-
 #
 # If there is an LIB target, put it here
 #
diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 71d02150dc..4f764ff9a6 100644
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -20,7 +20,6 @@ XINCDIRS	+= \
 			$(NWOS) \
 			$(AP_WORK)/modules/http \
 			$(AP_WORK)/modules/arch/netware \
-			$(AJPLIB) \
 			$(AP_WORK)/srclib/apr/include \
 			$(AP_WORK)/srclib/apr-util/include \
 			$(AP_WORK)/srclib/apr \
@@ -256,7 +255,7 @@ install :: nlms FORCE
 # Any specialized rules here
 #
 
-vpath %.c ../arch/netware $(AJPLIB)
+vpath %.c ../arch/netware
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined