tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/netscape Makefile.netware
Date Wed, 28 Jul 2004 14:24:48 GMT
fuankg      2004/07/28 07:24:48

  Modified:    jk/native/jni Makefile.netware
               jk/native/netscape Makefile.netware
  Log:
  few minor Makefile tweaks.
  
  Revision  Changes    Path
  1.4       +14 -11    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.netware	16 Mar 2004 12:58:37 -0000	1.3
  +++ Makefile.netware	28 Jul 2004 14:24:48 -0000	1.4
  @@ -4,14 +4,17 @@
   #
   
   # Edit the path below to point to the base of your Netscape includes.
  +ifndef NS_HOME
   NS_HOME	= c:/projects/sdks/netscape
  -
  +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	= /usr/prg/nlm
  -BASE	= c:/novell
  +ifndef NDKBASE
  +NDKBASE	= c:/novell
  +endif
   INSTDIR = /mnt/sys/novonyx/modules
   
   # Edit the vars below to change NLM target settings.
  @@ -64,7 +67,7 @@
   # 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.com/development/prgtools/mkxdc.zip
   MPKXDC	= mkxdc
   
   # Global flags for all compilers
  @@ -94,19 +97,19 @@
   #	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
   
   LDLIBS	=
   
  -NDK_ROOT = $(BASE)/ndk
  +NDK_ROOT = $(NDKBASE)/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 
  +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
  @@ -122,9 +125,9 @@
   	XDCDATA = $(OBJDIR)/$(TARGET).xdc
   endif
   
  -ifeq ($(OSTYPE),linux)
  +ifeq ($(findstring linux,$(OSTYPE)),linux)
   DL	= '
  --include $(BASE)/nlmconv/ncpfs.inc
  +#-include $(NDKBASE)/nlmconv/ncpfs.inc
   endif
   
   OBJS	= \
  
  
  
  1.4       +13 -10    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.netware	16 Mar 2004 12:58:37 -0000	1.3
  +++ Makefile.netware	28 Jul 2004 14:24:48 -0000	1.4
  @@ -4,14 +4,17 @@
   #
   
   # Edit the path below to point to the base of your Netscape includes.
  +ifndef NS_HOME
   NS_HOME	= c:/projects/sdks/netscape
  -
  +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	= /usr/prg/nlm
  -BASE	= c:/novell
  +ifndef NDKBASE
  +NDKBASE	= c:/novell
  +endif
   INSTDIR = /mnt/sys/novonyx/modules
   
   # Edit the vars below to change NLM target settings.
  @@ -87,19 +90,19 @@
   #	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
   
   LDLIBS	=
   
  -NDK_ROOT = $(BASE)/ndk
  +NDK_ROOT = $(NDKBASE)/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 
  +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
  @@ -115,9 +118,9 @@
   	XDCDATA = $(OBJDIR)/$(TARGET).xdc
   endif
   
  -ifeq ($(OSTYPE),linux)
  +ifeq ($(findstring linux,$(OSTYPE)),linux)
   DL	= '
  --include $(BASE)/nlmconv/ncpfs.inc
  +#-include $(NDKBASE)/nlmconv/ncpfs.inc
   endif
   
   OBJS	= \
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message