You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2004/08/14 19:36:06 UTC
cvs commit: httpd-2.0/modules/proxy NWGNUmakefile NWGNUproxyajp
bnicholes 2004/08/14 10:36:06
Modified: modules/proxy NWGNUmakefile NWGNUproxyajp
Log:
Conditionally build the proxy_ajp module of the ajplib file are available
Revision Changes Path
1.4 +7 -1 httpd-2.0/modules/proxy/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUmakefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NWGNUmakefile 13 Aug 2004 23:13:46 -0000 1.3
+++ NWGNUmakefile 14 Aug 2004 17:36:06 -0000 1.4
@@ -157,8 +157,14 @@
$(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
1.2 +5 -1 httpd-2.0/modules/proxy/NWGNUproxyajp
Index: NWGNUproxyajp
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxyajp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NWGNUproxyajp 13 Aug 2004 23:13:46 -0000 1.1
+++ NWGNUproxyajp 14 Aug 2004 17:36:06 -0000 1.2
@@ -20,6 +20,7 @@
$(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 \
@@ -168,6 +169,9 @@
FILES_nlm_objs = \
$(OBJDIR)/proxy_ajp.o \
$(OBJDIR)/proxy_util.o \
+ $(OBJDIR)/ajp_header.o \
+ $(OBJDIR)/ajp_msg.o \
+ $(OBJDIR)/ajp_link.o \
$(OBJDIR)/libprews.o \
$(EOLIST)
@@ -252,7 +256,7 @@
# Any specialized rules here
#
-vpath %.c ../arch/netware
+vpath %.c ../arch/netware $(AJPLIB)
#
# Include the 'tail' makefile that has targets that depend on variables defined