costin 01/11/07 13:43:35
Modified: jk/native/common list.mk.in
jk/native/iis isapi.dsp
jk/native/netscape Makefile.nw Makefile.solaris nsapi.dsp
jk/native/nt_service nt_service.dsp
Log:
I hope I cached all the makefiles and equivalents...
Mike - if you can use ant instead of Makefile.nw we could have one less,
and we can also remove the solaris-specific, pre-configure makefile.
Revision Changes Path
1.4 +3 -2 jakarta-tomcat-connectors/jk/native/common/list.mk.in
Index: list.mk.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/list.mk.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- list.mk.in 2001/11/05 23:19:29 1.3
+++ list.mk.in 2001/11/07 21:43:35 1.4
@@ -1,11 +1,12 @@
## Object needed for mod_jk for Apache-1.3
-APACHE_OBJECTS= ${JK}jk_ajp12_worker${OEXT} ${JK}jk_connect${OEXT} \
+APACHE_OBJECTS= ${JK}jk_connect${OEXT} \
${JK}jk_msg_buff${OEXT} ${JK}jk_util${OEXT} \
${JK}jk_ajp13${OEXT} ${JK}jk_pool${OEXT} \
${JK}jk_worker${OEXT} ${JK}jk_ajp13_worker${OEXT} \
- ${JK}jk_lb_worker${OEXT} ${JK}jk_sockbuf${OEXT} \
+ ${JK}jk_lb_worker${OEXT} \
${JK}jk_map${OEXT} ${JK}jk_uri_worker_map${OEXT} \
${JK}jk_ajp14${OEXT} ${JK}jk_ajp14_worker${OEXT} \
+ ${JK}jk_channel_socket${OEXT} \
${JK}jk_registry${OEXT} \
${JK}jk_env${OEXT} \
${JK}jk_md5${OEXT} @JK_JNI_WORKER@ \
1.7 +2 -10 jakarta-tomcat-connectors/jk/native/iis/isapi.dsp
Index: isapi.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/isapi.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- isapi.dsp 2001/11/05 23:28:11 1.6
+++ isapi.dsp 2001/11/07 21:43:35 1.7
@@ -96,7 +96,7 @@
# End Source File
# Begin Source File
-SOURCE=..\common\jk_ajp12_worker.c
+SOURCE=..\common\jk_channel_socket.c
# End Source File
# Begin Source File
@@ -160,10 +160,6 @@
# End Source File
# Begin Source File
-SOURCE=..\common\jk_sockbuf.c
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_uri_worker_map.c
# End Source File
# Begin Source File
@@ -188,7 +184,7 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\common\jk_ajp12_worker.h
+SOURCE=..\common\jk_channel.h
# End Source File
# Begin Source File
@@ -257,10 +253,6 @@
# Begin Source File
SOURCE=..\common\jk_service.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\jk_sockbuf.h
# End Source File
# Begin Source File
1.7 +1 -2 jakarta-tomcat-connectors/jk/native/netscape/Makefile.nw
Index: Makefile.nw
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/Makefile.nw,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.nw 2001/07/18 23:38:12 1.6
+++ Makefile.nw 2001/11/07 21:43:35 1.7
@@ -31,7 +31,7 @@
LINK=$(METROWERKSPATH)\bin\mwldnlm
JK_OBJS=\
- jk_ajp12_worker.obj \
+ jk_channel_socket.obj \
jk_ajp13_worker.obj \
jk_ajp14_worker.obj \
jk_ajp13.obj \
@@ -46,7 +46,6 @@
jk_msg_buff.obj \
jk_nsapi_plugin.obj \
jk_pool.obj \
- jk_sockbuf.obj \
jk_uri_worker_map.obj \
jk_util.obj \
jk_worker.obj \
1.5 +1 -1 jakarta-tomcat-connectors/jk/native/netscape/Makefile.solaris
Index: Makefile.solaris
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/Makefile.solaris,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.solaris 2001/06/07 14:19:35 1.4
+++ Makefile.solaris 2001/11/07 21:43:35 1.5
@@ -10,7 +10,7 @@
INCLUDEDIR=$(SUITSPOT_HOME)/include
JAVA_INCLUDE=$(JAVA_HOME)/include
-JK_OBJS = jk_ajp12_worker.o jk_lb_worker.o jk_sockbuf.o jk_connect.o jk_map.o \
+JK_OBJS = jk_lb_worker.o jk_channel_socket.o jk_connect.o jk_map.o \
jk_uri_worker_map.o jk_nsapi_plugin.o jk_util.o jk_jni_worker.o \
jk_pool.o jk_worker.o jk_ajp14.o jk_ajp14_worker.o jk_md5.o jk_ajp_common.o jk_context.o
1.6 +2 -10 jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp
Index: nsapi.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsapi.dsp 2001/11/05 23:28:11 1.5
+++ nsapi.dsp 2001/11/07 21:43:35 1.6
@@ -92,7 +92,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\common\jk_ajp12_worker.c
+SOURCE=..\common\jk_channel_socket.c
# End Source File
# Begin Source File
@@ -152,10 +152,6 @@
# End Source File
# Begin Source File
-SOURCE=..\common\jk_sockbuf.c
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_uri_worker_map.c
# End Source File
# Begin Source File
@@ -180,7 +176,7 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\common\jk_ajp12_worker.h
+SOURCE=..\common\jk_channel.h
# End Source File
# Begin Source File
@@ -249,10 +245,6 @@
# Begin Source File
SOURCE=..\common\jk_service.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\jk_sockbuf.h
# End Source File
# Begin Source File
1.4 +0 -4 jakarta-tomcat-connectors/jk/native/nt_service/nt_service.dsp
Index: nt_service.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/nt_service/nt_service.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nt_service.dsp 2001/06/07 14:21:46 1.3
+++ nt_service.dsp 2001/11/07 21:43:35 1.4
@@ -140,10 +140,6 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\common\jk_ajp12_worker.h
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_connect.h
# End Source File
# Begin Source File
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>
|