hgomez 01/05/18 07:47:47
Modified: jk/src/native/apache-1.3 Makefile.freebsd Makefile.in
Makefile.linux Makefile.nw mod_jk.dsp
Log:
updated build files for ajp14 stuff
Revision Changes Path
1.2 +2 -1
jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.freebsd
Index: Makefile.freebsd
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.freebsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.freebsd 2001/05/15 09:59:56 1.1
+++ Makefile.freebsd 2001/05/18 14:47:35 1.2
@@ -17,7 +17,8 @@
JK=../common/
SRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
jk_jni_worker.c jk_pool.c jk_worker.c jk_ajp13_worker.c jk_lb_worker.c \
- jk_sockbuf.c jk_map.c jk_uri_worker_map.c
+ jk_sockbuf.c jk_map.c jk_uri_worker_map.c jk_ajp14.c jk_ajp14_worker.c \
+ jk_md5.c
OBJS=${patsubst %.c,%.o,${SRCS}}
1.2 +2 -2 jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 2001/05/15 10:17:08 1.1
+++ Makefile.in 2001/05/18 14:47:37 1.2
@@ -10,8 +10,8 @@
JK=../common/
SRCS=${JK}/jk_ajp12_worker.c ${JK}/jk_connect.c ${JK}/jk_msg_buff.c ${JK}/jk_util.c
${JK}/jk_ajp13.c \
${JK}/jk_jni_worker.c ${JK}/jk_pool.c ${JK}/jk_worker.c
${JK}/jk_ajp13_worker.c ${JK}/jk_lb_worker.c \
- ${JK}/jk_sockbuf.c ${JK}/jk_map.c ${JK}/jk_uri_worker_map.c
-
+ ${JK}/jk_sockbuf.c ${JK}/jk_map.c ${JK}/jk_uri_worker_map.c ${JK}/jk_ajp14.c
${JK}/jk_ajp14_worker.c \
+ ${JK}/jk_md5.c
all: mod_jk.so
1.2 +3 -2
jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.linux
Index: Makefile.linux
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.linux 2001/05/15 09:59:56 1.1
+++ Makefile.linux 2001/05/18 14:47:38 1.2
@@ -4,7 +4,7 @@
# JAVA_HOME=
OS=linux
-JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
+JAVA_INCL=-DUSE_APACHE_MD5 -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
#ifndef APXS
APXS=/usr/sbin/apxs
@@ -13,7 +13,8 @@
JK=../common/
SRCS=${JK}/jk_ajp12_worker.c ${JK}/jk_connect.c ${JK}/jk_msg_buff.c ${JK}/jk_util.c
${JK}/jk_ajp13.c \
${JK}/jk_jni_worker.c ${JK}/jk_pool.c ${JK}/jk_worker.c
${JK}/jk_ajp13_worker.c ${JK}/jk_lb_worker.c \
- ${JK}/jk_sockbuf.c ${JK}/jk_map.c ${JK}/jk_uri_worker_map.c
+ ${JK}/jk_sockbuf.c ${JK}/jk_map.c ${JK}/jk_uri_worker_map.c ${JK}/jk_ajp14.c
${JK}/jk_ajp14_worker.c \
+ ${JK}/jk_md5.c
all: mod_jk.so
1.2 +4 -0 jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.nw
Index: Makefile.nw
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.nw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.nw 2001/05/15 09:59:57 1.1
+++ Makefile.nw 2001/05/18 14:47:38 1.2
@@ -27,6 +27,10 @@
jk_worker.obj \
mod_jk.obj \
jk_nwmain.obj \
+ jk_ajp14.obj \
+ jk_ajp14_worker.obj \
+ jk_md5.obj
+
all: $(NLM_NAME).nlm
1.2 +26 -0 jakarta-tomcat-connectors/jk/src/native/apache-1.3/mod_jk.dsp
Index: mod_jk.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/mod_jk.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_jk.dsp 2001/05/15 10:00:54 1.1
+++ mod_jk.dsp 2001/05/18 14:47:39 1.2
@@ -147,6 +147,19 @@
SOURCE=.\mod_jk.c
# End Source File
# End Group
+
+SOURCE=..\common\jk_ajp14.c
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_ajp14_worker.c
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_md5.c
+# End Source File
+# End Group
+
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
@@ -223,6 +236,19 @@
SOURCE=..\common\jk_worker_list.h
# End Source File
# End Group
+
+SOURCE=..\common\jk_ajp14.h
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_ajp14_worker.h
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_md5.h
+# End Source File
+# End Group
+
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
