marcsaeg 01/03/27 13:31:44
Modified: src/native/apache1.3 Tag: tomcat_32 Makefile.nw
src/native/jni_connect Tag: tomcat_32 Makefile.nw
src/native/netscape Tag: tomcat_32 Makefile.nw
Log:
Updated makefiles for building connectors for the NetWare platform.
Submitted by: Mike Anderson [[EMAIL PROTECTED]]
Revision Changes Path
No revision
No revision
1.1.2.2 +40 -16 jakarta-tomcat/src/native/apache1.3/Attic/Makefile.nw
Index: Makefile.nw
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/apache1.3/Attic/Makefile.nw,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Makefile.nw 2000/09/13 23:06:20 1.1.2.1
+++ Makefile.nw 2001/03/27 21:31:44 1.1.2.2
@@ -1,13 +1,36 @@
+ifndef VERBOSE
.SILENT:
+endif
NLM_NAME=mod_jk
+
+#
+# Base environment
+#
+ifndef TOOLPATH
+TOOLPATH = D:\Tools
+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 JDKPATH
+JDKPATH=$(TOOLPATH)\jdk\jdk-1_2_2
+endif
+ifndef NOVELLNDK
+NOVELLNDK=$(TOOLPATH)\nwsdk
+endif
+
+ifndef APACHE_SRC
+APACHE_SRC=d:\apache_1.3.17\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
@@ -43,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
@@ -56,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" >> $@
@@ -91,13 +115,13 @@
@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 *.obj > NUL
+ -@del *.map > NUL
+ -@del link.* > NUL
+ -@del cc.opt > NUL
+ -@del *.nlm > NUL
No revision
No revision
1.1.2.2 +29 -11 jakarta-tomcat/src/native/jni_connect/Attic/Makefile.nw
Index: Makefile.nw
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/jni_connect/Attic/Makefile.nw,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Makefile.nw 2000/09/13 23:06:28 1.1.2.1
+++ Makefile.nw 2001/03/27 21:31:44 1.1.2.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,9 +98,9 @@
@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 *.obj > NUL
+ -@del *.map > NUL
+ -@del link.* > NUL
+ -@del cc.opt > NUL
+ -@del *.nlm > NUL
No revision
No revision
1.1.2.2 +33 -13 jakarta-tomcat/src/native/netscape/Attic/Makefile.nw
Index: Makefile.nw
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/netscape/Attic/Makefile.nw,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Makefile.nw 2000/09/13 23:06:29 1.1.2.1
+++ Makefile.nw 2001/03/27 21:31:44 1.1.2.2
@@ -1,11 +1,31 @@
+ifndef VERBOSE
.SILENT:
+endif
NLM_NAME=nsapi_rd
+
+#
+# Base environment
+#
+ifndef TOOLPATH
+TOOLPATH = D:\Tools
+endif
+
+ifndef JDKPATH
+JDKPATH=$(TOOLPATH)\jdk\jdk-1_2_2
+endif
-JDKPATH=k:\jdk\jdk-1_2_2
-NOVELLNDK=r:\nwsdk
-NSSDK=r:\netscape
-METROWERKSPATH=k:\mw\5.3
+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
@@ -44,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
@@ -63,8 +83,8 @@
@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 -warnings off >> $@
@echo -zerobss >> $@
@echo -desc "Netscape Plugin for Tomcat" >> $@
@@ -89,13 +109,13 @@
@echo Import @$(NOVELLNDK)\imports\nlmlib.imp >> link.def
@echo Import @$(NOVELLNDK)\imports\threads.imp >> link.def
@echo Import @$(NOVELLNDK)\imports\socklib.imp >> link.def
- @echo Import @$(NSSDK)\imports\nsapi.imp >> link.def
+ @echo Import __nsapi30_table >> link.def
@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 *.obj > NUL
+ -@del *.map > NUL
+ -@del link.* > NUL
+ -@del cc.opt > NUL
+ -@del *.nlm > NUL
