larryi 01/05/18 13:53:26 Modified: jk/src/native/apache-1.3 Makefile.nw jk/src/native/jni Makefile.nw jk/src/native/netscape Makefile.nw Log: Updates to connector make files for Netware. Submitted by: Mike Anderson Revision Changes Path 1.3 +41 -21 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.nw 2001/05/18 14:47:38 1.2 +++ Makefile.nw 2001/05/18 20:53:20 1.3 @@ -1,13 +1,36 @@ +ifndef VERBOSE .SILENT: +endif NLM_NAME=mod_jk + +# +# Base environment +# +ifndef TOOLPATH +TOOLPATH = D:\Tools +endif + +ifndef JDKPATH +JDKPATH=$(TOOLPATH)\jdk\jdk-1_2_2 +endif + +ifndef NOVELLNDK +NOVELLNDK=$(TOOLPATH)\nwsdk +endif -JDKPATH=k:\jdk\jdk-1_2_2 -NOVELLNDK=r:\nwsdk -APACHE_HOME=d:\apache_1.3.12\src -WINSOCK_INCDIR=k:\ws295sdk\include -METROWERKSPATH=k:\mw\5.3 +ifndef APACHE_SRC +APACHE_SRC=d:\apache_1.3.19\src +endif + +ifndef METROWERKSPATH +METROWERKSPATH=$(TOOLPATH)\mw\5.3 +endif +ifndef WINSOCK_INCDIR +WINSOCK_INCDIR=$(NOVELLNDK)\include\winsock +endif + CC=$(METROWERKSPATH)\bin\mwccnlm LINK=$(METROWERKSPATH)\bin\mwldnlm @@ -27,10 +50,6 @@ jk_worker.obj \ mod_jk.obj \ jk_nwmain.obj \ - jk_ajp14.obj \ - jk_ajp14_worker.obj \ - jk_md5.obj - all: $(NLM_NAME).nlm @@ -47,7 +66,7 @@ @$(CC) $< -o=$(@F) @cc.opt cc.opt: Makefile.nw - -@del cc.opt 2> NUL + -@del cc.opt > NUL @echo Generating $@ @echo -nosyspath -ext obj -c -align 1 -w nocmdline -bool on >> $@ ifdef DEBUG @@ -60,16 +79,17 @@ @echo -I$(METROWERKSPATH)\include >> $@ @echo -I$(JDKPATH)\include >> $@ @echo -I$(JDKPATH)\include\netware >> $@ - @echo -I$(APACHE_HOME)\include >> $@ - @echo -I$(APACHE_HOME)\os\netware >> $@ + @echo -I$(APACHE_SRC)\include >> $@ + @echo -I$(APACHE_SRC)\os\netware >> $@ @echo -I$(WINSOCK_INCDIR) >> $@ @echo -DN_PLAT_NLM >> $@ @echo -DNETWARE >> $@ @echo -DXP_NETWARE >> $@ link.opt: Makefile.nw - -@del link.opt 2> NUL - -@del link.def 2> NUL + -@del link.opt > NUL + -@del link.def > NUL + @echo Generating $@ @echo -warnings off >> $@ @echo -zerobss >> $@ @echo -desc "Apache 1.3 Plugin for Tomcat" >> $@ @@ -95,14 +115,14 @@ @echo Import @$(NOVELLNDK)\imports\threads.imp >> link.def @echo Import @$(NOVELLNDK)\imports\socklib.imp >> link.def @echo Import @$(NOVELLNDK)\imports\ws2nlm.imp >> link.def - @echo Import @$(APACHE_HOME)\os\netware\ApacheCore.imp >> link.def + @echo Import @$(APACHE_SRC)\os\netware\ApacheCore.imp >> link.def @echo Export jk_module >> link.def clean: - -@del *.obj 2> NUL - -@del *.map 2> NUL - -@del link.* 2> NUL - -@del cc.opt 2> NUL - -@del *.nlm 2> NUL - -@del *.sym 2> NUL + -@del *.obj > NUL + -@del *.map > NUL + -@del link.* > NUL + -@del cc.opt > NUL + -@del *.nlm > NUL + -@del *.sym > NUL 1.2 +30 -12 jakarta-tomcat-connectors/jk/src/native/jni/Makefile.nw Index: Makefile.nw =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/jni/Makefile.nw,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.nw 2001/05/14 09:49:37 1.1 +++ Makefile.nw 2001/05/18 20:53:22 1.2 @@ -1,11 +1,28 @@ +ifndef VERBOSE .SILENT: +endif NLM_NAME=jni_conn -JDKPATH=k:\jdk\jdk-1_2_2 -NOVELLNDK=r:\nwsdk -METROWERKSPATH=k:\mw\5.3 +# +# Base environment +# +ifndef TOOLPATH +TOOLPATH = D:\Tools +endif +ifndef JDKPATH +JDKPATH=$(TOOLPATH)\jdk\jdk-1_2_2 +endif + +ifndef NOVELLNDK +NOVELLNDK=$(TOOLPATH)\nwsdk +endif + +ifndef METROWERKSPATH +METROWERKSPATH=$(TOOLPATH)\mw\5.3 +endif + CC=$(METROWERKSPATH)\bin\mwccnlm LINK=$(METROWERKSPATH)\bin\mwldnlm @@ -33,7 +50,7 @@ cc.opt: Makefile.nw - -@del cc.opt 2> NUL + -@del cc.opt > NUL @echo Generating $@ @echo -nosyspath -ext obj -c -align 1 -w nocmdline -bool on >> $@ ifdef DEBUG @@ -51,8 +68,9 @@ @echo -DXP_NETWARE >> $@ link.opt: Makefile.nw - -@del link.opt 2> NUL - -@del link.def 2> NUL + -@del link.opt > NUL + -@del link.def > NUL + @echo Generating $@ @echo -warnings off >> $@ @echo -zerobss >> $@ @echo -desc "JNI Natives for Tomcat" >> $@ @@ -80,10 +98,10 @@ @echo Export @jk_jnicb.exp >> link.def clean: - -@del *.obj 2> NUL - -@del *.map 2> NUL - -@del link.* 2> NUL - -@del cc.opt 2> NUL - -@del *.nlm 2> NUL - -@del *.sym 2> NUL + -@del *.obj > NUL + -@del *.map > NUL + -@del link.* > NUL + -@del cc.opt > NUL + -@del *.nlm > NUL + -@del *.sym > NUL 1.3 +34 -16 jakarta-tomcat-connectors/jk/src/native/netscape/Makefile.nw Index: Makefile.nw =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/netscape/Makefile.nw,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.nw 2001/05/18 14:55:07 1.2 +++ Makefile.nw 2001/05/18 20:53:23 1.3 @@ -1,12 +1,32 @@ +ifndef VERBOSE .SILENT: +endif NLM_NAME=nsapi_rd + +# +# Base environment +# +ifndef TOOLPATH +TOOLPATH = D:\Tools +endif -JDKPATH=k:\jdk\jdk-1_2_2 -NOVELLNDK=r:\nwsdk -NSSDK=r:\netscape -METROWERKSPATH=k:\mw\5.3 +ifndef JDKPATH +JDKPATH=$(TOOLPATH)\jdk\jdk-1_2_2 +endif + +ifndef NOVELLNDK +NOVELLNDK=$(TOOLPATH)\nwsdk +endif +ifndef NSSDK +NSSDK=$(TOOLPATH)\sdk\netscape +endif + +ifndef METROWERKSPATH +METROWERKSPATH=$(TOOLPATH)\mw\5.3 +endif + CC=$(METROWERKSPATH)\bin\mwccnlm LINK=$(METROWERKSPATH)\bin\mwldnlm @@ -26,9 +46,6 @@ jk_util.obj \ jk_worker.obj \ jk_nwmain.obj \ - jk_ajp14.obj \ - jk_ajp14_worker.obj \ - jk_md5.obj all: $(NLM_NAME).nlm @@ -47,7 +64,7 @@ cc.opt: Makefile.nw - -@del cc.opt 2> NUL + -@del cc.opt > NUL @echo Generating $@ @echo -nosyspath -ext obj -c -align 1 -w nocmdline -bool on >> $@ ifdef DEBUG @@ -66,8 +83,9 @@ @echo -DXP_NETWARE >> $@ link.opt: Makefile.nw - -@del link.opt 2> NUL - -@del link.def 2> NUL + -@del link.opt > NUL + -@del link.def > NUL + @echo Generating $@ @echo -warnings off >> $@ @echo -zerobss >> $@ @echo -desc "Netscape Plugin for Tomcat" >> $@ @@ -96,10 +114,10 @@ @echo Export jk_init, jk_service >> link.def clean: - -@del *.obj 2> NUL - -@del *.map 2> NUL - -@del link.* 2> NUL - -@del cc.opt 2> NUL - -@del *.nlm 2> NUL - -@del *.sym 2> NUL + -@del *.obj > NUL + -@del *.map > NUL + -@del link.* > NUL + -@del cc.opt > NUL + -@del *.nlm > NUL + -@del *.sym > NUL