cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.netware
clar2005/06/10 09:24:35 Modified:jk/native/apache-1.3 Makefile.netware Log: mod_jk is not MT safe for NetWare on Apache 1.3.x Revision ChangesPath 1.7 +1 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.netware13 Feb 2005 22:28:07 -1.6 +++ Makefile.netware10 Jun 2005 16:24:35 -1.7 @@ -22,7 +22,7 @@ VERSION= $(JK_VERSION) COPYR= Copyright (c) 2000-2004 The Apache Software Foundation. All rights reserved. DESCR= Apache $(AP_VERSION_STR) plugin for Jakarta/Tomcat $(JK_VERSION_STR) -MTSAFE= YES +MTSAFE= NO STACK= 49152 #SCREEN= NONE EXPORTS= jk_module
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.netware NWGNUmakefile.mak
fuankg 2005/02/13 14:28:07 Modified:jk/native/apache-1.3 Makefile.netware NWGNUmakefile.mak Log: fixed var names. Revision ChangesPath 1.6 +6 -6 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.netware 6 Feb 2005 17:43:09 - 1.5 +++ Makefile.netware 13 Feb 2005 22:28:07 - 1.6 @@ -1,21 +1,21 @@ # # Makefile for mod_jk (NetWare version - gnu make) -# created by Guenter Knauf [EMAIL PROTECTED] +# created by Guenter Knauf [EMAIL PROTECTED] # # Edit the path below to point to the base of your Apache 1.3 includes. ifndef AP_HOME -AP_HOME = c:/projects/cw/apache_1.3.31 +AP_HOME = c:/projects/cw/apache_1.3.33 endif # Edit the path below to point to the base of your NetWare Java SDK. -ifndef NW_JDK -NW_JDK = c:/projects/sdks/java-nw +ifndef JAVA_HOME +JAVA_HOME= c:/projects/sdks/java-nw endif # Edit the path below to point to the base of your Novell NDK. ifndef NDKBASE NDKBASE = c:/novell endif -INSTDIR = s:/apache/modules +INSTDIR = s:/apache/modules # Edit the vars below to change NLM target settings. TARGET = mod_jk @@ -103,7 +103,7 @@ JKCOMMON = ../common INCLUDES = -I$(AP_HOME)/src/include -I$(AP_HOME)/src/os/netware -INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware +INCLUDES += -I$(JKCOMMON) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/netware ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks 1.2 +4 -4 jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak Index: NWGNUmakefile.mak === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NWGNUmakefile.mak 13 Feb 2005 22:15:15 - 1.1 +++ NWGNUmakefile.mak 13 Feb 2005 22:28:07 - 1.2 @@ -8,8 +8,8 @@ # # Edit the path below to point to the base of your NetWare Java SDK. -ifndef NW_JDK -NW_JDK = d:/projects/sdks/java-nw +ifndef JAVA_HOME +JAVA_HOME = c:/projects/sdks/java-nw endif JKCOMMON = ../common @@ -29,8 +29,8 @@ # XINCDIRS += \ $(JKCOMMON) \ - $(NW_JDK)/include \ - $(NW_JDK)/include/netware \ + $(JAVA_HOME)/include \ + $(JAVA_HOME)/include/netware \ $(SRC)\include \ $(NWOS) \ $(EOLIST) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.netware
fuankg 2004/07/28 07:35:46 Modified:jk/native/apache-1.3 Makefile.netware Log: few minor Makefile tweaks. Revision ChangesPath 1.4 +14 -11jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.netware 16 Mar 2004 12:58:37 - 1.3 +++ Makefile.netware 28 Jul 2004 14:35:46 - 1.4 @@ -4,14 +4,17 @@ # # Edit the path below to point to the base of your Apache 1.3 includes. -#AP_HOME = c:/projects/cw/apache-1.3 -AP_HOME = c:/projects/cw/apache_1.3.29 - +ifndef AP_HOME +AP_HOME = c:/projects/cw/apache_1.3.31 +endif # Edit the path below to point to the base of your NetWare Java SDK. -JDK = c:/projects/sdks/java-nw - +ifndef NW_JDK +NW_JDK = c:/projects/sdks/java-nw +endif # Edit the path below to point to the base of your Novell NDK. -BASE = c:/novell +ifndef NDKBASE +NDKBASE = c:/novell +endif INSTDIR = s:/apache/modules # Edit the vars below to change NLM target settings. @@ -84,7 +87,7 @@ #CFLAGS += -D__ANSIC__ else #PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o - CFLAGS += -include $(BASE)/nlmconv/genlm.h + CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h endif endif CFLAGS += -include precomp.h @@ -94,20 +97,20 @@ endif -NDK_ROOT = $(BASE)/ndk +NDK_ROOT = $(NDKBASE)/ndk SDK_CLIB = $(NDK_ROOT)/nwsdk SDK_LIBC = $(NDK_ROOT)/libc JKCOMMON = ../common INCLUDES = -I$(AP_HOME)/src/include -I$(AP_HOME)/src/os/netware -INCLUDES += -I$(JKCOMMON) -I$(JDK)/include -I$(JDK)/include/netware +INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks INCLUDES += -I$(SDK_LIBC)/include/winsock else INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include - INCLUDES += -I$(BASE)/ws295sdk/include + INCLUDES += -I$(NDKBASE)/ws295sdk/include CFLAGS += -DNETDB_USE_INTERNET endif CFLAGS += $(INCLUDES) @@ -118,7 +121,7 @@ ifeq ($(OSTYPE),linux) DL = ' --include $(BASE)/nlmconv/ncpfs.inc +-include $(NDKBASE)/nlmconv/ncpfs.inc endif OBJS = \ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.netware
hgomez 2004/03/16 00:50:36 Added: jk/native/netscape Makefile.netware jk/native/jni Makefile.netware jk/native/apache-1.3 Makefile.netware Log: Netware makefile. Provided by Guenter Knauf Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware Index: Makefile.netware === # # Makefile for jk_nsapi_plugin (NetWare version - gnu make) # created by Guenter Knauf [EMAIL PROTECTED] # # Edit the path below to point to the base of your Netscape includes. NS_HOME = c:/projects/sdks/netscape # Edit the path below to point to the base of your NetWare Java SDK. JDK = c:/projects/sdks/java-nw # Edit the path below to point to the base of your Novell NDK. # BASE= /usr/prg/nlm BASE = c:/novell INSTDIR = /mnt/sys/novonyx/modules # Edit the vars below to change NLM target settings. TARGET = nsapi_rd VERSION = $(JK_VERSION) COPYR = Copyright (c) 2000-2004 The Apache Software Foundation. All rights reserved. DESCR = Netscape plugin for Jakarta/Tomcat $(JK_VERSION_STR) MTSAFE= NO STACK = 64000 #SCREEN = System Console MODULES = nshttpd EXPORTS = jk_init jk_service IMPORTS = __nsapi30_table # Edit the var below to point to your lib architecture. ifndef LIBARCH LIBARCH = CLIB # LIBARCH = LIBC endif # must be equal to DEBUG or NDEBUG DB= NDEBUG # DB = DEBUG # Optimization: -On or debugging: -g ifeq ($(DB),NDEBUG) OPT = -O2 OBJDIR = release else OPT = -g OBJDIR = debug endif # Include the version info retrieved from jk_version.h -include $(OBJDIR)/version.inc # The following line defines your compiler. ifdef METROWERKS CC = mwccnlm else CC = gcc endif # RM = rm -f # CP = cp -fv # if you want to mark the target as MTSAFE you will need a tool for # generating the xdc data for the linker; here's a minimal tool: # http://www.gknw.de/development/prgtools/mkxdc.zip MPKXDC= mkxdc # Global flags for all compilers CFLAGS= $(OPT) -D$(DB) -DNETWARE -DXP_NETWARE -nostdinc ifeq ($(CC),mwccnlm) LD= mwldnlm LDFLAGS = -nostdlib $(PRELUDE) $(OBJDIR)/*.o -o $(OBJDIR)/$(TARGET).nlm -commandfile CFLAGS+= -gccinc -inline off -opt nointrinsics #CFLAGS += -w on ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.o CFLAGS += -align 4 -inst mmx -proc 686 # CFLAGS += -D__ANSIC__ else PRELUDE = $(METROWERKS)/Novell Support/libraries/runtime/prelude.obj # CFLAGS += -include $(METROWERKS)/Novell Support/headers/nlm_prefix.h CFLAGS += -align 1 -proc 586 endif else LD= nlmconv LDFLAGS = -T CFLAGS+= -fno-builtin -fpack-struct -fpcc-struct-return CFLAGS+= -Wall -Wno-main # -pedantic ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o # CFLAGS += -D__ANSIC__ else PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o CFLAGS += -include $(BASE)/nlmconv/genlm.h endif endif LDLIBS= NDK_ROOT = $(BASE)/ndk SDK_CLIB = $(NDK_ROOT)/nwsdk SDK_LIBC = $(NDK_ROOT)/libc JKCOMMON = ../common INCLUDES = -I$(NS_HOME)/include -I$(NS_HOME)/include/base INCLUDES += -I$(JKCOMMON) -I$(JDK)/include -I$(JDK)/include/netware ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks INCLUDES += -I$(SDK_LIBC)/include/winsock else INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete CFLAGS += -DNETDB_USE_INTERNET endif CFLAGS+= $(INCLUDES) ifeq ($(MTSAFE),YES) XDCDATA = $(OBJDIR)/$(TARGET).xdc endif ifeq ($(OSTYPE),linux) DL= ' -include $(BASE)/nlmconv/ncpfs.inc endif OBJS = \ $(OBJDIR)/jk_nwmain.o \ $(OBJDIR)/jk_ajp12_worker.o \ $(OBJDIR)/jk_ajp13.o \ $(OBJDIR)/jk_ajp13_worker.o \ $(OBJDIR)/jk_ajp14.o \ $(OBJDIR)/jk_ajp14_worker.o \ $(OBJDIR)/jk_ajp_common.o \ $(OBJDIR)/jk_connect.o \ $(OBJDIR)/jk_context.o \ $(OBJDIR)/jk_jni_worker.o \ $(OBJDIR)/jk_lb_worker.o \ $(OBJDIR)/jk_map.o \ $(OBJDIR)/jk_md5.o \ $(OBJDIR)/jk_msg_buff.o \ $(OBJDIR)/jk_pool.o \ $(OBJDIR)/jk_sockbuf.o \ $(OBJDIR)/jk_uri_worker_map.o \ $(OBJDIR)/jk_util.o \ $(OBJDIR)/jk_worker.o \ $(OBJDIR)/jk_nsapi_plugin.o all: $(OBJDIR) $(OBJDIR)/version.inc $(OBJDIR)/$(TARGET).nlm $(OBJDIR)/%.o: %.c @echo Compiling $ @$(CC) $(CFLAGS) -c $ -o $@ $(OBJDIR)/%.o: $(JKCOMMON)/%.c @echo Compiling $ @$(CC) $(CFLAGS)
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.netware
hgomez 2004/03/16 00:51:23 Modified:jk/native/netscape Makefile.netware jk/native/jni Makefile.netware jk/native/apache-1.3 Makefile.netware Log: *** keyword substitution change *** Revision ChangesPath 1.2 +0 -0 jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 1.2 +0 -0 jakarta-tomcat-connectors/jk/native/jni/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/jni/Makefile.netware,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 1.2 +0 -0 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.netware
hgomez 2004/03/16 04:58:37 Modified:jk/native/netscape Makefile.netware jk/native/jni Makefile.netware jk/native/apache-1.3 Makefile.netware Log: NW Makefiles are Makefile.netware, fix name eveywhere Revision ChangesPath 1.3 +2 -2 jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.netware 16 Mar 2004 08:51:23 - 1.2 +++ Makefile.netware 16 Mar 2004 12:58:37 - 1.3 @@ -177,11 +177,11 @@ @-$(RM) $@ @$(LD) $(LDFLAGS) $(OBJDIR)/$(TARGET).def -$(OBJDIR)/%.xdc: Makefile.NetWare +$(OBJDIR)/%.xdc: Makefile.netware @echo Creating $@ @$(MPKXDC) $(XDCOPT) $@ -$(OBJDIR)/%.def: Makefile.NetWare +$(OBJDIR)/%.def: Makefile.netware @echo $(DL)# DEF file for linking with $(LD)$(DL) $@ @echo $(DL)# Do not edit this file - it is created by make!$(DL) $@ @echo $(DL)# All your changes will be lost!!$(DL) $@ 1.3 +2 -2 jakarta-tomcat-connectors/jk/native/jni/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/jni/Makefile.netware,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.netware 16 Mar 2004 08:51:23 - 1.2 +++ Makefile.netware 16 Mar 2004 12:58:37 - 1.3 @@ -169,11 +169,11 @@ @-$(RM) $@ @$(LD) $(LDFLAGS) $(OBJDIR)/$(TARGET).def -$(OBJDIR)/%.xdc: Makefile.NetWare +$(OBJDIR)/%.xdc: Makefile.netware @echo Creating $@ @$(MPKXDC) $(XDCOPT) $@ -$(OBJDIR)/%.def: Makefile.NetWare +$(OBJDIR)/%.def: Makefile.netware @echo $(DL)# DEF file for linking with $(LD)$(DL) $@ @echo $(DL)# Do not edit this file - it is created by make!$(DL) $@ @echo $(DL)# All your changes will be lost!!$(DL) $@ 1.3 +2 -2 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.netware 16 Mar 2004 08:51:23 - 1.2 +++ Makefile.netware 16 Mar 2004 12:58:37 - 1.3 @@ -182,11 +182,11 @@ @-$(RM) $@ @$(LD) $(LDFLAGS) $(OBJDIR)/$(TARGET).def -$(OBJDIR)/%.xdc: Makefile.NetWare +$(OBJDIR)/%.xdc: Makefile.netware @echo Creating $@ @$(MPKXDC) $(XDCOPT) $@ -$(OBJDIR)/%.def: Makefile.NetWare +$(OBJDIR)/%.def: Makefile.netware @echo $(DL)# DEF file for linking with $(LD)$(DL) $@ @echo $(DL)# Do not edit this file - it is created by make!$(DL) $@ @echo $(DL)# All your changes will be lost!!$(DL) $@ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
