Author: fuankg
Date: Mon Apr 16 07:55:45 2007
New Revision: 529276
URL: http://svn.apache.org/viewvc?view=rev&rev=529276
Log:
changed makefiles to pick up ap_snprintf(); fixed linking.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware
tomcat/connectors/trunk/jk/native/jni/Makefile.netware
tomcat/connectors/trunk/jk/native/netscape/Makefile.netware
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware?view=diff&rev=529276&r1=529275&r2=529276
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware Mon Apr 16
07:55:45 2007
@@ -5,11 +5,11 @@
# 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.33
+AP_HOME = c:/projects/cw/apache_1.3.37
endif
# Edit the path below to point to the base of your NetWare Java SDK.
-ifndef JAVA_HOME
-JAVA_HOME = 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.
ifndef NDKBASE
@@ -18,15 +18,17 @@
INSTDIR = s:/apache/modules
# Edit the vars below to change NLM target settings.
-TARGET = mod_jk
+TARGET = mod_jk
VERSION = $(JK_VERSION)
-COPYR = Copyright (c) 2000-2004 The Apache Software Foundation. All rights
reserved.
+#COPYR = Copyright (c) 2000-2007 The Apache Software Foundation. All rights
reserved.
+COPYR = Licensed under the Apache License, Version 2.0
DESCR = Apache $(AP_VERSION_STR) plugin for Tomcat $(JK_VERSION_STR)
MTSAFE = NO
-STACK = 49152
+STACK = 65536
#SCREEN = NONE
EXPORTS = jk_module
#AP_PRE = YES
+#MODULES =
# Edit the var below to point to your lib architecture.
ifndef LIBARCH
@@ -54,16 +56,18 @@
CC = mwccnlm
else
CC = gcc
+ GCC_ROOT = $(MINGNLM)
endif
# RM = rm -f
#CP = cp -fv
+AWK = awk
# Global flags for all compilers
CFLAGS = $(OPT) -D$(DB) -DNETWARE -nostdinc
ifeq ($(CC),mwccnlm)
LD = mwldnlm
-LDFLAGS = -nostdlib $(PRELUDE) $(OBJDIR)/*.o -o $(OBJDIR)/$(TARGET).nlm
-commandfile
+LDFLAGS = -nostdlib $(OBJS) $(PRELUDE) $(LDLIBS) -o $@ -commandfile
CFLAGS += -gccinc -inline off -opt nointrinsics
#CFLAGS += -w on
ifeq ($(LIBARCH),LIBC)
@@ -73,6 +77,7 @@
else
# PRELUDE = $(SDK_CLIB)/imports/clibpre.obj
PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
+ LDLIBS = "$(METROWERKS)/Novell Support/libraries/runtime/mwcrtl.lib"
# CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
CFLAGS += -align 1 -proc 586
endif
@@ -87,6 +92,8 @@
# CFLAGS += -D__ANSIC__
else
# PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o
+ PRELUDE = $(NDK_ROOT)/pre/prelude.o
+ LDLIBS = $(GCC_ROOT)/lib/gcc-lib/i586-netware/3.2.3/libgcc.a
CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
endif
endif
@@ -103,7 +110,7 @@
JKCOMMON = ../common
INCLUDES = -I$(AP_HOME)/src/include -I$(AP_HOME)/src/os/netware
-INCLUDES += -I$(JKCOMMON) -I$(JAVA_HOME)/include
-I$(JAVA_HOME)/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
@@ -119,12 +126,13 @@
XDCDATA = $(AP_HOME)/src/os/netware/apache.xdc
endif
-ifeq ($(OSTYPE),linux)
+ifeq ($(findstring linux,$(OSTYPE)),linux)
DL = '
--include $(NDKBASE)/nlmconv/ncpfs.inc
+#-include $(NDKBASE)/nlmconv/ncpfs.inc
endif
OBJS = \
+ $(OBJDIR)/$(TARGET).o \
$(OBJDIR)/jk_nwmain.o \
$(OBJDIR)/jk_ajp12_worker.o \
$(OBJDIR)/jk_ajp13.o \
@@ -145,27 +153,22 @@
$(OBJDIR)/jk_status.o \
$(OBJDIR)/jk_uri_worker_map.o \
$(OBJDIR)/jk_util.o \
- $(OBJDIR)/jk_worker.o \
- $(OBJDIR)/$(TARGET).o
+ $(OBJDIR)/jk_worker.o
+#OBJS += $(OBJDIR)/ap_snprintf.o
-all: $(OBJDIR) $(OBJDIR)/version.inc $(OBJDIR)/$(TARGET).nlm
+vpath %.c . $(JKCOMMON) $(AP_HOME)/src/os/netware
-$(OBJDIR)/%.o: %.c
- @echo Compiling $<
- @$(CC) $(CFLAGS) -c $< -o $@
-$(OBJDIR)/%.o: $(JKCOMMON)/%.c
- @echo Compiling $<
- @$(CC) $(CFLAGS) -c $< -o $@
+all: $(OBJDIR) $(OBJDIR)/version.inc $(OBJDIR)/$(TARGET).nlm
-$(OBJDIR)/%.o: $(AP_HOME)/src/os/netware/%.c
+$(OBJDIR)/%.o: %.c
@echo Compiling $<
@$(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(AP_HOME)/src/include/httpd.h
$(OBJDIR)
@echo Creating $@
- @awk -f ../../support/get_ver.awk $< $(AP_HOME)/src/include/httpd.h > $@
+ @$(AWK) -f ../../support/get_ver.awk $< $(AP_HOME)/src/include/httpd.h
> $@
dist: all
-$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
@@ -182,6 +185,7 @@
$(OBJDIR):
@mkdir $(OBJDIR)
+#$(OBJDIR)/$(TARGET).nlm: $(OBJS) $(OBJDIR)/$(TARGET).def $(XDCDATA) $(PRELUDE)
$(OBJDIR)/$(TARGET).nlm: $(OBJS) $(OBJDIR)/$(TARGET).def $(XDCDATA)
@echo Linking $@
@-$(RM) $@
@@ -213,7 +217,7 @@
ifeq ($(DB),DEBUG)
@echo $(DL)debug$(DL) >> $@
endif
- @echo $(DL)threadname "$(TARGET)"$(DL) >> $@
+ @echo $(DL)threadname "$*"$(DL) >> $@
ifdef XDCDATA
@echo $(DL)xdcdata $(XDCDATA)$(DL) >> $@
endif
@@ -233,11 +237,7 @@
@echo $(DL)import @$(AP_HOME)/src/os/netware/apachecore.imp$(DL) >> $@
@echo $(DL)module clib$(DL) >> $@
else
-ifeq ($(LD),nlmconv)
@echo $(DL)flag_on 64$(DL) >> $@
-else
- @echo $(DL)autounload$(DL) >> $@
-endif
@echo $(DL)pseudopreemption$(DL) >> $@
@echo $(DL)start _LibCPrelude$(DL) >> $@
@echo $(DL)exit _LibCPostlude$(DL) >> $@
@@ -260,6 +260,9 @@
ifeq ($(LD),nlmconv)
@echo $(DL)input $(OBJS)$(DL) >> $@
@echo $(DL)input $(PRELUDE)$(DL) >> $@
- @echo $(DL)output $(TARGET).nlm$(DL) >> $@
+ifdef LDLIBS
+ @echo $(DL)input $(LDLIBS)$(DL) >> $@
+endif
+ @echo $(DL)output $*.nlm$(DL) >> $@
endif
Modified: tomcat/connectors/trunk/jk/native/jni/Makefile.netware
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/jni/Makefile.netware?view=diff&rev=529276&r1=529275&r2=529276
==============================================================================
--- tomcat/connectors/trunk/jk/native/jni/Makefile.netware (original)
+++ tomcat/connectors/trunk/jk/native/jni/Makefile.netware Mon Apr 16 07:55:45
2007
@@ -1,6 +1,6 @@
#
# Makefile for jk_nsapi_plugin (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 Netscape includes.
@@ -15,12 +15,16 @@
ifndef NDKBASE
NDKBASE = c:/novell
endif
-INSTDIR = /mnt/sys/novonyx/modules
+
+ifndef INSTDIR
+INSTDIR = s:/sys/novonyx/modules
+endif
# Edit the vars below to change NLM target settings.
TARGET = jni_conn
VERSION = $(JK_VERSION)
-COPYR = Copyright (c) 2000-2004 The Apache Software Foundation. All rights
reserved.
+#COPYR = Copyright (c) 2000-2007 The Apache Software Foundation. All rights
reserved.
+COPYR = Licensed under the Apache License, Version 2.0
DESCR = JNI natives for Tomcat $(JK_VERSION_STR)
MTSAFE = NO
STACK = 64000
@@ -67,15 +71,16 @@
# 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.com/development/prgtools/mkxdc.zip
+# http://www.gknw.net/development/prgtools/mkxdc.zip
MPKXDC = mkxdc
+AWK = awk
# 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
+LDFLAGS = -nostdlib $(OBJS) $(PRELUDE) $(LDLIBS) -o $@ -commandfile
CFLAGS += -gccinc -inline off -opt nointrinsics
#CFLAGS += -w on
ifeq ($(LIBARCH),LIBC)
@@ -84,6 +89,7 @@
# CFLAGS += -D__ANSIC__
else
PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
+ LDLIBS = "$(METROWERKS)/Novell Support/libraries/runtime/mwcrtl.lib"
# CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
CFLAGS += -align 1 -proc 586
endif
@@ -101,8 +107,6 @@
endif
endif
-LDLIBS =
-
NDK_ROOT = $(NDKBASE)/ndk
SDK_CLIB = $(NDK_ROOT)/nwsdk
SDK_LIBC = $(NDK_ROOT)/libc
@@ -116,7 +120,7 @@
INCLUDES += -I$(SDK_LIBC)/include/winsock
else
INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
- INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
+ # INCLUDES += -I$(NDKBASE)/ws295sdk/include
CFLAGS += -DNETDB_USE_INTERNET
endif
CFLAGS += $(INCLUDES)
@@ -131,11 +135,14 @@
endif
OBJS = \
+ $(OBJDIR)/jk_jnicb.o \
$(OBJDIR)/jk_nwmain.o \
$(OBJDIR)/jk_map.o \
$(OBJDIR)/jk_pool.o \
$(OBJDIR)/jk_util.o \
- $(OBJDIR)/jk_jnicb.o
+ $(OBJDIR)/ap_snprintf.o
+
+vpath %.c . $(JKCOMMON)
all: $(OBJDIR) $(OBJDIR)/version.inc $(OBJDIR)/$(TARGET).nlm
@@ -144,13 +151,9 @@
@echo Compiling $<
@$(CC) $(CFLAGS) -c $< -o $@
-$(OBJDIR)/%.o: $(JKCOMMON)/%.c
- @echo Compiling $<
- @$(CC) $(CFLAGS) -c $< -o $@
-
$(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(OBJDIR)
@echo Creating $@
- @awk -f ../../support/get_ver.awk $< > $@
+ @$(AWK) -f ../../support/get_ver.awk $< > $@
dist: all
-$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
@@ -236,6 +239,10 @@
ifeq ($(LD),nlmconv)
@echo $(DL)input $(OBJS)$(DL) >> $@
@echo $(DL)input $(PRELUDE)$(DL) >> $@
- @echo $(DL)output $(TARGET).nlm$(DL) >> $@
+ifdef LDLIBS
+ @echo $(DL)input $(LDLIBS)$(DL) >> $@
endif
+ @echo $(DL)output $*.nlm$(DL) >> $@
+endif
+
Modified: tomcat/connectors/trunk/jk/native/netscape/Makefile.netware
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/Makefile.netware?view=diff&rev=529276&r1=529275&r2=529276
==============================================================================
--- tomcat/connectors/trunk/jk/native/netscape/Makefile.netware (original)
+++ tomcat/connectors/trunk/jk/native/netscape/Makefile.netware Mon Apr 16
07:55:45 2007
@@ -1,6 +1,6 @@
#
# Makefile for jk_nsapi_plugin (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 Netscape includes.
@@ -15,15 +15,19 @@
ifndef NDKBASE
NDKBASE = c:/novell
endif
-INSTDIR = /mnt/sys/novonyx/modules
+
+ifndef INSTDIR
+INSTDIR = s:/sys/novonyx/modules
+endif
# Edit the vars below to change NLM target settings.
TARGET = nsapi_rd
VERSION = $(JK_VERSION)
-COPYR = Copyright (c) 2000-2005 The Apache Software Foundation. All rights
reserved.
+#COPYR = Copyright (c) 2000-2007 The Apache Software Foundation. All rights
reserved.
+COPYR = Licensed under the Apache License, Version 2.0
DESCR = Netscape plugin for Tomcat $(JK_VERSION_STR)
MTSAFE = NO
-STACK = 64000
+STACK = 65536
#SCREEN = System Console
MODULES = nshttpd
EXPORTS = jk_init jk_service
@@ -60,15 +64,16 @@
# 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
+# http://www.gknw.net/development/prgtools/mkxdc.zip
MPKXDC = mkxdc
+AWK = awk
# 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
+LDFLAGS = -nostdlib $(OBJS) $(PRELUDE) $(LDLIBS) -o $@ -commandfile
CFLAGS += -gccinc -inline off -opt nointrinsics
#CFLAGS += -w on
ifeq ($(LIBARCH),LIBC)
@@ -77,6 +82,7 @@
# CFLAGS += -D__ANSIC__
else
PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
+ LDLIBS = "$(METROWERKS)/Novell Support/libraries/runtime/mwcrtl.lib"
# CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
CFLAGS += -align 1 -proc 586
endif
@@ -94,8 +100,6 @@
endif
endif
-LDLIBS =
-
NDK_ROOT = $(NDKBASE)/ndk
SDK_CLIB = $(NDK_ROOT)/nwsdk
SDK_LIBC = $(NDK_ROOT)/libc
@@ -109,7 +113,7 @@
INCLUDES += -I$(SDK_LIBC)/include/winsock
else
INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
- INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
+ # INCLUDES += -I$(NDKBASE)/ws295sdk/include
CFLAGS += -DNETDB_USE_INTERNET
endif
CFLAGS += $(INCLUDES)
@@ -124,6 +128,7 @@
endif
OBJS = \
+ $(OBJDIR)/jk_nsapi_plugin.o \
$(OBJDIR)/jk_nwmain.o \
$(OBJDIR)/jk_ajp12_worker.o \
$(OBJDIR)/jk_ajp13.o \
@@ -145,7 +150,9 @@
$(OBJDIR)/jk_uri_worker_map.o \
$(OBJDIR)/jk_util.o \
$(OBJDIR)/jk_worker.o \
- $(OBJDIR)/jk_nsapi_plugin.o
+ $(OBJDIR)/ap_snprintf.o
+
+vpath %.c . $(JKCOMMON)
all: $(OBJDIR) $(OBJDIR)/version.inc $(OBJDIR)/$(TARGET).nlm
@@ -154,13 +161,9 @@
@echo Compiling $<
@$(CC) $(CFLAGS) -c $< -o $@
-$(OBJDIR)/%.o: $(JKCOMMON)/%.c
- @echo Compiling $<
- @$(CC) $(CFLAGS) -c $< -o $@
-
$(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(OBJDIR)
@echo Creating $@
- @awk -f ../../support/get_ver.awk $< > $@
+ @$(AWK) -f ../../support/get_ver.awk $< > $@
dist: all
-$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
@@ -246,6 +249,10 @@
ifeq ($(LD),nlmconv)
@echo $(DL)input $(OBJS)$(DL) >> $@
@echo $(DL)input $(PRELUDE)$(DL) >> $@
- @echo $(DL)output $(TARGET).nlm$(DL) >> $@
+ifdef LDLIBS
+ @echo $(DL)input $(LDLIBS)$(DL) >> $@
endif
+ @echo $(DL)output $*.nlm$(DL) >> $@
+endif
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
