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 7b54f947230647954bce0ffb71264e4561102a4b..841673e47398fac20fa70475669223f0a112618a 100644 (file)
--- 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 71d02150dce48859bcaa7d62879907ccd2f7129e..4f764ff9a663c64e6b3e68d621c852b2e5c6cc70 100644 (file)
--- 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