This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
perldelta for #113730, do and $@
[perl5.git] / NetWare / Makefile
index ec06f7c..d73b682 100644 (file)
@@ -1,7 +1,7 @@
 ##
-## Makefile to build Perl on NetWare using Microsoft NMAKE and Watcom tools
+## Makefile to build Perl on NetWare using Microsoft NMAKE and CodeWarrior tools
 ##
-## This will build perl.nlm, perl.lib and extensions called NLPs
+## This will build perl.nlm, perl.lib and extensions called NLMs
 ##
 
 ##
 ##
 
 ## This file is created by using the makefile that creates Windows Perl as the reference
-## Author: sgp
+## Author:
 ## Date Created: 13th July 2000
-## Date Modified: 2nd July 2001
-
+## Date Modified: 21st March 2002
 # Name of the NLM
+
+
 NLM_NAME               = perl.nlm
 NLM_NAME8              = Perl
 
@@ -31,114 +32,154 @@ NW_FLAGS  = -DNETWARE -DNLM_PLATFORM -DNETDB_USE_INTERNET
 REL_DIR        = Release
 DEB_DIR = Debug
 
+
+!ifndef NLMSDKBASE
+!message "Run bat\SetNWBld.bat to set the NetWare SDK before continuing.\n"
+!error
+!endif                                                                                 # !ifndef NLMSDKBASE
+
+!ifndef CODEWAR                                                                        # !ifdef CODEWAR
+!message "CodeWarrior tools base directory is not defined. Run bat\setnwbld.bat before proceeding"
+!error
+!endif                                                                                 # !ifdef CODEWAR
+
 !ifndef MAKE_TYPE
-#MAKE_TYPE = Release
 !message "Run bat\buildtype.bat to set the build type before continuing.\n"
 !error
-!endif                                                                                                                         #!ifndef MAKE_TYPE
+!endif                                                                                 !ifndef MAKE_TYPE
 
 !ifdef USE_MPK
 MPKFLAGS       = -DMPK_ON -DIAPX386
 MPKMESSAGE = MPK Build...
 XDCTOOL        = mpkxdc
 !ifndef MPKBASE
-#MPKBASE                       = p:\mpk
-!message "Run bat\setnwbld.bat to set the NetWare MPK SDK before continuing.\n"
+!message "Run bat\setmpksdk.bat to set the NetWare MPK SDK before continuing.\n"
 !error
-!endif                                                                                                                         #ifndef MPKBASE
-NLM_INCLUDE_MP         = $(MPKBASE)\include
+!endif                                                                                 # !ifndef MPKBASE
+NLM_INCLUDE_MP         = -I$(MPKBASE)\include
 MPKTOOL = $(MPKBASE)\$(XDCTOOL)
-!else
+!else                                                                                  # !ifdef USE_MPK
 MPKMESSAGE = Non MPK Build...
 NLM_INCLUDE_MP =
 MPKTOOL = 
-!endif                                                                                                                         #ifdef USE_MPK
+!endif                                                                                 # !ifdef USE_MPK
+
+#!ifndef SECURITYBASE
+#!message "Run bat\SetSecSdk.bat to set the Security path before continuing.\n"
+#!error
+#!endif                                                                                        # !ifndef SECURITYBASE
+
+#!ifndef UCSINC
+#!message "Run bat\BldNWExt.bat to set the UCS Include path before continuing.\n"
+#!error
+#!endif                                                                                        # !ifndef UCSINC
+
+NLMIMPORTS                     = $(NLMSDKBASE)\imports
+
+!ifdef SECURITYBASE
+SECURITY_IMPORTS       = $(SECURITYBASE)\imports
+!endif                                                                                 # !ifdef SECURITYBASE
+
+!ifndef NLM_VERSION
+NLM_VERSION    = 3,20,0
+!endif
 
-!ifndef NLMSDKBASE
-#NLMSDKBASE            = P:\ndk\nwsdk
-!message "Run bat\setnwbld.bat to set the NetWare SDK before continuing.\n"
-!error
-!endif                                                                                                                         #ifndef NLMSDKBASE
-NLMIMPORTS      = $(NLMSDKBASE)\imports
 
-!ifdef WATCOM
-C_COMPILER             = wcc386
-CPP_COMPILER   = wpp386
-NLM_LINK               = wlink
-NLM_LIB                        = lib386
-TOOL_HEADERS   = $(WATCOM)\H;$(WATCOM)\H\NT
-TOOL_PATH              = $(WATCOM)\BINNT;$(WATCOM)\BINW
-CCFLAGS                        = /zp1 /5s /w1 /zq /ms /otexanih /fpi
-COMPILER_FLAG  = -DWATCOM
-ERROR_FLAG             = -Fr
-!if "$(MAKE_TYPE)"=="Debug"
-BLDDIR          = $(DEB_DIR)
-BLDMESG                        = Debug version,
-!ifdef USE_D2
-BS_CFLAGS      = /od /d2 /en /st /hc -DDEBUGGING -DUSE_D2 $(DBG_FLAG)
-BLDMESG                = $(BLDMESG) Using /d2 option
-!else
-BS_CFLAGS      = /od /d1 /en /st /hc -DDEBUGGING $(DBG_FLAG)
-BLDMESG                = $(BLDMESG) Using /d1 option
-!endif                                                                                                                         #!ifdef USE_D2  
-! else
-BLDDIR          = $(REL_DIR)
-BLDMESG                = Release version
-BS_CFLAGS      = 
-!endif                                                                                                                         #if "$(MAKE_TYPE)"=="Debug"
-!else                                                                                                                          #ifdef WATCOM
-!ifdef CODEWARRIOR
 # Here comes the CW tools - TO BE FILLED TO BUILD WITH CW -
-C_COMPILER             = 
-CPP_COMPILER   = 
-NLM_LINK               = 
-NLM_LIB                        = 
+MODULE_DESC     = "Perl 5.17.2 for NetWare"
+CCTYPE          = CodeWarrior
+C_COMPILER             = mwccnlm -c
+CPP_COMPILER   = mwccnlm
+LINK               = mwldnlm      
+LD              = mwldnlm
+NLM_LIB                = mwldnlm -type library
 TOOL_HEADERS   = 
 TOOL_PATH              = 
-CCFLAGS                        = 
-COMPILER_FLAG  = 
-ERROR_FLAG             =
+CWCPPFLAGS      = -cpp_exceptions on -wchar_t off -bool on -w on -ansi off
+CCFLAGS                        = -maxerrors 25 -processor Pentium -align packed \
+                  -w nounusedarg -msext on \
+                  -DN_PLAT_NLM -DNLM=1 -D__NO_MATH_OPS -msgstyle gcc
+COMPILER_FLAG  = -d NETWARE
+ERROR_FLAG             = -sym on -sym codeview4 -sym internal
+LDFLAGS         = -type generic -stacksize 16384 -zerobss \
+                  -nofail -msgstyle gcc -nostderr -w on \
+                  -nlmversion $(NLM_VERSION) \
+                  -copy "Copyright (C) 2000-01\, 2002 Novell\, Inc. All Rights Reserved."
+
 # Debug flags comes here - Not mandatory - required only for debug build
 !if "$(MAKE_TYPE)"=="Debug"
 BLDDIR          = $(DEB_DIR)
-BLDMESG                        = Debug version,
+BLDMESG            = Debug version,
 !ifdef USE_D2
-BS_CFLAGS      = 
+BS_CFLAGS      = -opt off -inline off -sym on -sym codeview4 -sym internal -DDEBUGGING -DDKFBPON
 BLDMESG                = $(BLDMESG) Using /d2 option
-!else
-BS_CFLAGS      = 
+!ifdef NLM_NAME8
+LDFLAGS                = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(MAKE_TYPE)\$(NLM_NAME8).sym
+!else                                                                                          # !ifdef NLM_NAME8
+LDFLAGS                = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(MAKE_TYPE)\$(NLM_NAME).sym
+!endif                                                                                         # !ifdef NLM_NAME8
+!else                                                                                          # !ifdef USE_D2
+BS_CFLAGS      = -opt off -inline off -sym on -sym codeview4 -sym internal -DDEBUGGING -DDKFBPON
 BLDMESG                = $(BLDMESG) Using /d1 option
-!endif                                                                                                                         #!ifdef USE_D2  
-! else
+!ifdef NLM_NAME8
+LDFLAGS                = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(MAKE_TYPE)\$(NLM_NAME8).sym
+!else                                                                                          # !ifdef NLM_NAME8
+LDFLAGS                = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(MAKE_TYPE)\$(NLM_NAME).sym
+!endif                                                                                         # !ifdef NLM_NAME8
+!endif                                                                                         # !ifdef USE_D2
+!else                                                                                          # !if "$(MAKE_TYPE)"=="Debug"
 BLDDIR      = $(REL_DIR)
 BLDMESG                = Release version
+##BS_CFLAGS    = -opt speed -inline smart -inline auto -sym off
 BS_CFLAGS      = 
-!endif                                                                                                                         #if "$(MAKE_TYPE)"=="Debug"
-!else                                                                                                                          #!ifdef CODEWARRIOR
-!message "Tools base directory is not defined. Run bat\setnwbld.bat before proceeding"
-!error
-Run bat\setnwbld.bat
-!endif                                                                                                                         #!ifdef CODEWARRIOR
-!endif                                                                                                                         #ifdef WATCOM
+!endif                                                                                         # !if "$(MAKE_TYPE)"=="Debug"
+
 
 ADD_LOCDEFS =  -DPERL_CORE
 
 NLM_INCLUDE                    = -I$(NLMSDKBASE)\include
 NLM_INCLUDE_NLM                = -I$(NLMSDKBASE)\include\nlm
 NLM_INCLUDE_NLM_SYS = -I$(NLMSDKBASE)\include\nlm\sys
+NLM_INCLUDE_OBSLETE = -I$(NLMSDKBASE)\include\nlm\obsolete
+
+!ifdef SECURITYBASE
+SECURITY_INCLUDE       = -I$(SECURITYBASE)\include
+!endif                                                                                 #!ifdef SECURITYBASE
+
+!ifdef UCSINC
+NLM_INCLUDE_UCS     = -I$(UCSINC)
+!endif                                                                                 #!ifndef UCSINC
+
+!if "$(NW_EXTNS)"=="yes" 
 INCLUDE_NW          = -I.\include
+!endif
+
+
 INC_PREV                       = -I..
-INC_THIS                       = -I.\
+INC_THIS                       = -I.
+
+
+NLM_INCLUDE_PATH = $(NLM_INCLUDE) $(NLM_INCLUDE_NLM) $(NLM_INCLUDE_NLM_SYS) $(NLM_INCLUDE_OBSLETE) \
+                   $(NLM_INCLUDE_MP) $(TOOL_HEADERS)
 
-NLM_INCLUDE_PATH = $(NLMSDKBASE)\include\nlm;$(NLMSDKBASE)\include;$(NLMSDKBASE)\include\nlm\sys;$(NLM_INCLUDE_MP);$(TOOL_HEADERS)
+!ifdef SECURITYBASE
+NLM_INCLUDE_PATH = $(NLM_INCLUDE_PATH) $(SECURITY_INCLUDE)
+!endif                                                                                 #!ifdef SECURITYBASE
 
-INCLUDE = $(NLM_INCLUDE_PATH)
+!ifdef UCSINC
+NLM_INCLUDE_PATH = $(NLM_INCLUDE_PATH) $(NLM_INCLUDE_UCS)
+!endif                                                                                 #!ifndef UCSINC
+
+INCLUDE = $(INC_THIS) $(INC_PREV) -I- $(NLM_INCLUDE_PATH)
 
 PATH = $(PATH);$(TOOL_PATH)
  
-NLM_INCLUDES   =       -I$(COREDIR) $(INCLUDE_NW) $(INC_THIS) $(INC_PREV)
+NLM_INCLUDES   = -I$(COREDIR) $(INCLUDE_NW)
+
+CCFLAGS     = $(CCFLAGS) $(INCLUDE)
 
-COMPLER_FLAGS  =  $(CCFLAGS) $(BS_CFLAGS) $(ADD_BUILDOPT) $(NW_FLAGS) $(COMPILER_FLAG) $(MPKFLAGS)
+COMPLER_FLAGS  =  $(BS_CFLAGS) $(ADD_BUILDOPT) $(NW_FLAGS) $(COMPILER_FLAG) $(MPKFLAGS) $(CCFLAGS)
+                  
 
 # Source file list
 NW_H_FILES                     =       \
@@ -151,14 +192,15 @@ NW_H_FILES                        =       \
                                                .\nwplglob.h    \
                                                .\nwtinfo.h     \
                                                .\nwutil.h      \
-                                               .\nwperlsys.h   \
+                                               .\nwhashcls.h \
 
 NW_HOST_H_FILES                =       \
                                                .\iperlhost.h   \
                                                .\interface.h   \
                                                .\netware.h     \
                                                .\nw5sck.h      \
-                                               .\nwperlsys.h   \
+                                               .\nwperlhost.h  \
+
 
 CLIB_H_FILES           =       \
                                                .\clibsdio.h    \
@@ -169,6 +211,7 @@ CLIB_H_FILES                =       \
 
 NW_SRC                         =       \
                                                .\CLIBstuf.c    \
+                                               .\sv_nw.c               \
                                                .\nw5.c         \
                                                .\nw5sck.c      \
                                                .\nw5thread.c \
@@ -178,18 +221,23 @@ NW_SRC                            =       \
                                                .\nwtinfo.c \
                                                .\nwutil.c  \
 
+NW_CPP_SRC          =   \
+                                               .\nwhashcls.cpp \
+                                               .\interface.cpp \
+                                               .\perllib.cpp   \
+
 EXT_MAIN_SRC           =       \
                                                .\Main.c        \
 
 PERL_IO_SRC                    =       \
                                                ..\perlio.c     
 
-PERL_LIB_SRC           =       \
-                                               .\interface.c   \
-                                               .\nwperlsys.c \
-
+CLIBSTUF_OBJ           =       \
+                                               .\CLIBstuf.obj
 
+#PERL_TMP_OBJ       = $(PERL_TEMP_SRC:.c=.obj)
 NW_SRC_OBJ                     = $(NW_SRC:.c=.obj)
+NW_CPP_SRC_OBJ      = $(NW_CPP_SRC:.cpp=.obj)
 NLM_MICROCORE_OBJ      = $(MICROCORE_SRC:.c=.obj) 
 PERL_LIB_OBJ           = $(PERL_LIB_SRC:.c=.obj)
 PERL_IO_OBJ                    = $(PERL_IO_SRC:.c=.obj)
@@ -198,14 +246,16 @@ EXT_MAIN_OBJ              = $(EXT_MAIN_SRC:.c=.obj)
 
 # For dependency checking 
 # $(BLDDIR) in place of Release or Debug is not working, should look into this - sgp
-!if "$(BLDDIR)"=="Release"
+!if "$(BLDDIR)"=="Release" 
 NLM_OBJ                                = $(NLM_CORE_OBJ:..\=.\Release\)
 NEWTARE_OBJ_DEP                = $(NW_SRC_OBJ:.\=.\Release\)
+NEWTARE_CPP_OBJ_DEP    = $(NW_CPP_SRC_OBJ:.\=.\Release\)
 PERL_LIB_OBJ_DEP       = $(PERL_LIB_OBJ:.\=.\Release\)
 PERL_IO_OBJ_DEP                = $(PERL_IO_OBJ:..\=.\Release\)
 !else
 NLM_OBJ                                = $(NLM_CORE_OBJ:..\=.\Debug\)
 NEWTARE_OBJ_DEP                = $(NW_SRC_OBJ:.\=.\Debug\)
+NEWTARE_CPP_OBJ_DEP    = $(NW_CPP_SRC_OBJ:.\=.\Debug\)
 PERL_LIB_OBJ_DEP       = $(PERL_LIB_OBJ:.\=.\Debug\)
 PERL_IO_OBJ_DEP                = $(PERL_IO_OBJ:..\=.\Debug\)
 !endif
@@ -221,6 +271,7 @@ NW_CFG_VARS = \
                "INST_NW_VER=$(INST_NW_VER)"    \
                "archname=$(ARCHNAME)"                  \
                "cc=$(C_COMPILER)"                              \
+               "ar=$(LINK)"                            \
                "ccflags=$(COMPLER_FLAGS)"      \
                "cf_email=$(EMAIL)"                     \
                "d_crypt=$(D_CRYPT)"                    \
@@ -234,20 +285,17 @@ NW_CFG_VARS = \
                "static_ext=$(STATIC_EXT)"              \
                "dynamic_ext=$(DYNAMIC_EXT)"            \
                "nonxs_ext=$(NONXS_EXT)"                \
-               "use5005threads=$(USE_5005THREADS)"     \
                "useithreads=$(USE_ITHREADS)"           \
-               "usethreads=$(USE_5005THREADS)"         \
                "usemultiplicity=$(USE_MULTI)"          \
-               "ld=$(NLM_LINK)"                        \
+               "ld=$(LINK)"                    \
                "base_import=$(BASE_IMPORT_FILES)"      \
                "LINK_FLAGS=$(LINK_FLAGS:"=\")"         \
                "optimize="             \
-               "d_times=define"                                        \
                "d_stdio_cnt_lval=undef"                \
                "d_stdio_ptr_lval=undef"                \
                "d_stdiobase=undef"                             \
                "d_stdstdio=undef"                              \
-               "d_times=undef"                 \
+               "d_times=undef"                                 \
                "direntrytype=DIR"                              \
                "nlm_version=$(NLM_VERSION)"            \
                "d_archname=NetWare"    \
@@ -258,64 +306,69 @@ NW_CFG_VARS = \
 NW_CFGSH_TMPL  = config.wc
 NW_CFGH_TMPL   = config_H.wc
 
-SOCKET_NLP     = $(AUTODIR)\Socket\Socket.nlp
-FCNTL_NLP      = $(AUTODIR)\Fcntl\Fcntl.nlp
-IO_NLP         = $(AUTODIR)\IO\IO.nlp
-OPCODE_NLP     = $(AUTODIR)\Opcode\Opcode.nlp
-SDBM_FILE_NLP  = $(AUTODIR)\SDBM_File\SDBM_File.nlp
-POSIX_NLP      = $(AUTODIR)\POSIX\POSIX.nlp
-ATTRS_NLP      = $(AUTODIR)\attrs\attrs.nlp
-THREAD_NLP     = $(AUTODIR)\Thread\Thread.nlp
-B_NLP          = $(AUTODIR)\B\B.nlp
-DUMPER_NLP     = $(AUTODIR)\Data\Dumper\Dumper.nlp
-PEEK_NLP       = $(AUTODIR)\Devel\Peek\Peek.nlp
-RE_NLP         = $(AUTODIR)\re\re.nlp
-BYTELOADER_NLP = $(AUTODIR)\ByteLoader\ByteLoader.nlp
-DPROF_NLP      = $(AUTODIR)\Devel\DProf\DProf.nlp
-GLOB_NLP       = $(AUTODIR)\File\Glob\Glob.nlp
-CWD_NLP                = $(AUTODIR)\Cwd\Cwd.nlp
-STORABLE_NLP   = $(AUTODIR)\Storable\Storable.nlp
-LISTUTIL_NLP   = $(AUTODIR)\List\Util\Util.nlp
-MIMEBASE64_NLP = $(AUTODIR)\MIME\Base64\Base64.nlp
-XSTYPEMAP_NLP  = $(AUTODIR)\XS\Typemap\Typemap.nlp
-
-EXTENSION_NLP  =               \
-               $(FCNTL_NLP)    \
-               $(BYTELOADER_NLP)       \
-               $(IO_NLP)               \
-               $(SOCKET_NLP)   \
-               $(OPCODE_NLP)   \
-               $(B_NLP)                \
-               $(ATTRS_NLP)    \
-               $(SDBM_FILE_NLP)        \
-               $(POSIX_NLP)    \
-               $(THREAD_NLP)   \
-               $(DUMPER_NLP)   \
-               $(GLOB_NLP)             \
-               $(PEEK_NLP)             \
-               $(RE_NLP)       \
-               $(DPROF_NLP)    \
-               $(STORABLE_NLP) \
-               $(LISTUTIL_NLP) \
-               $(MIMEBASE64_NLP) \
-               $(XSTYPEMAP_NLP)        \
-#              $(CWD_NLP)      \
-# cwd.pm needs to be modifed for NetWare.
-
-# Begin - Following is required to build NetWare specific extensions Perl2UCS & CGI2Perl
-
-PERL2UCS               = $(EXTDIR)\Perl2UCS\Perl2UCS
+SOCKET_NLM     = $(AUTODIR)\Socket\Socket.NLM
+FCNTL_NLM      = $(AUTODIR)\Fcntl\Fcntl.NLM
+IO_NLM         = $(AUTODIR)\IO\IO.NLM
+OPCODE_NLM     = $(AUTODIR)\Opcode\Opcode.NLM
+SDBM_FILE_NLM = $(AUTODIR)\SDBM_File\SDBM_File.NLM
+POSIX_NLM      = $(AUTODIR)\POSIX\POSIX.NLM
+ATTRIBUTES_NLM = $(AUTODIR)\attributes\attributes.NLM
+B_NLM          = $(AUTODIR)\B\B.NLM
+DUMPER_NLM     = $(AUTODIR)\Data\Dumper\Dumper.NLM
+PEEK_NLM       = $(AUTODIR)\Devel\Peek\Peek.NLM
+RE_NLM         = $(AUTODIR)\re\re.NLM
+BYTELOADER_NLM = $(AUTODIR)\ByteLoader\ByteLoader.NLM
+GLOB_NLM       = $(AUTODIR)\File\Glob\Glob.NLM
+HOSTNAME_NLM   = $(AUTODIR)\Sys\Hostname\Hostname.NLM
+CWD_NLM                        = $(EXTDIR)\Cwd\Cwd.NLM
+STORABLE_NLM           = $(EXTDIR)\Storable\Storable.NLM
+LISTUTIL_NLM           = $(EXTDIR)\List\Util.NLM
+MIMEBASE64_NLM         = $(EXTDIR)\MIME\Base64\Base64.NLM
+XSAPITEST_NLM          = $(EXTDIR)\XS\APItest\APItest.NLM
+XSTYPEMAP_NLM          = $(EXTDIR)\XS\Typemap\Typemap.NLM
+UNICODENORMALIZE_NLM   = $(EXTDIR)\Unicode\Normalize\Normalize.NLM
+UNICODECOLLATE_NLM     = $(EXTDIR)\Unicode\Collate\Collate.NLM
+
+EXTENSION_NLM  =               \
+               $(FCNTL_NLM)    \
+               $(BYTELOADER_NLM)       \
+               $(IO_NLM)               \
+               $(SOCKET_NLM)   \
+               $(OPCODE_NLM)   \
+               $(B_NLM)                \
+               $(ATTRIBUTES_NLM)       \
+               $(SDBM_FILE_NLM)        \
+               $(POSIX_NLM)    \
+               $(DUMPER_NLM)   \
+               $(GLOB_NLM)             \
+               $(PEEK_NLM)             \
+               $(RE_NLM)       \
+               $(HOSTNAME_NLM)         \
+               $(CWD_NLM)              \
+               $(STORABLE_NLM)         \
+               $(LISTUTIL_NLM)         \
+               $(MIMEBASE64_NLM)       \
+               $(XSAPITEST_NLM)        \
+               $(XSTYPEMAP_NLM)        \
+               $(UNICODENORMALIZE_NLM)  \
+               $(FILTER_NLM)   
+
+# Begin - Following is required to build NetWare specific extensions CGI2Perl, Perl2UCS and UCSExt
 CGI2PERL               = CGI2Perl\CGI2Perl
+PERL2UCS               = Perl2UCS\Perl2UCS
+UCSExt                 = Perl2UCS\UCSExt
 
-PERL2UCS_NLP = $(AUTODIR)\Perl2UCS\Perl2UCS.nlp
-CGI2PERL_NLP = \CGI2Perl\CGI2Perl.nlp
+CGI2PERL_NLM = \CGI2Perl\CGI2Perl.NLM
+PERL2UCS_NLM = $(AUTODIR)\Perl2UCS\Perl2UCS.NLM
+UCSExt_NLM = $(AUTODIR)\UCSExt\UCSExt.NLM
 
 NETWARE_EXTNS =        \
-               $(PERL2UCS_NLP) \
-               $(CGI2PERL_NLP)
-
+               $(CGI2PERL_NLM) \
+               $(PERL2UCS_NLM) \
+               $(UCSExt_NLM)
 # End
 
+
 ECHO_SRC                       = TestNLM\echo\echo.c
 TYPE_SRC                       = TestNLM\type\type.c
 ECHO_SRC_OBJ                   = $(ECHO_SRC:.c=.obj)
@@ -327,26 +380,21 @@ TEST_NLMS =       \
                        $(ECHO_NLM)     \
                        $(TYPE_NLM)     \
 
-ERRNO_PM_NW    = $(LIBDIR)\Errno.pm
-
-EXTENSION_NPM =        \
-               $(ERRNO_PM_NW)  \
-
 
 !ifndef SCREEN
 SCREEN          = 'none'
 !endif
 
 !ifndef NLM_DESCRIPTION
-NLM_DESCRIPTION = $(NLM_NAME8) for Netware
+NLM_DESCRIPTION = $(NLM_NAME8) for NetWare
 !endif
 
 !ifndef NLM_VERSION
-NLM_VERSION    = 5.72.0
+NLM_VERSION    = 3.1.0
 !endif
 
 !ifndef NLM_EXT
-NLM_EXT        = NLM
+NLM_EXT         = NLM
 !endif
 
 !ifndef BUILT
@@ -354,9 +402,14 @@ BUILT     = $(BLDDIR)\$(NLM_NAME8).$(NLM_EXT)
 !endif
 
 !ifndef BASE_IMPORT_FILES
-BASE_IMPORT_FILES = Import @$(NLMIMPORTS)\clib.imp, @$(NLMIMPORTS)\nlmlib.imp, @$(NLMIMPORTS)\threads.imp, @$(NLMIMPORTS)\nit.imp, @$(NLMIMPORTS)\socklib.imp, @$(NLMIMPORTS)\fpsm.imp, @$(NLMIMPORTS)\lib0.imp
+BASE_IMPORT_FILES = Import @$(NLMIMPORTS)\clib.imp, @$(NLMIMPORTS)\nlmlib.imp, @$(NLMIMPORTS)\threads.imp, @$(NLMIMPORTS)\nit.imp, @$(NLMIMPORTS)\socklib.imp, \
+@$(NLMIMPORTS)\fpsm.imp, @$(NLMIMPORTS)\lib0.imp
 !endif
 
+!ifdef SECURITYBASE
+BASE_IMPORT_FILES = $(BASE_IMPORT_FILES), @$(SECURITY_IMPORTS)\nwsec.imp
+!endif                                                                                 # !ifdef SECURITYBASE
+
 !ifdef USE_MPK
 BASE_IMPORT_FILES = $(BASE_IMPORT_FILES), @$(MPKBASE)\import\mpkorg.imp
 !endif
@@ -365,31 +418,25 @@ BASE_IMPORT_FILES = $(BASE_IMPORT_FILES), @$(MPKBASE)\import\mpkorg.imp
 BASE_IMPORT_FNS = Import ImportSymbol, GetSystemConsoleScreen, LoadModule
 !endif
 
-!ifdef WATCOM
-NWLIBPATH  = $(WATCOM)\lib386\netware
-LIBPATH386 = $(WATCOM)\lib386
-LIBPATH = $(NWLIBPATH);$(LIBPATH386)
-!else                                                                                                                          #!ifdef WATCOM
-!ifdef CODEWARRIOR
+!ifdef CODEWAR
 NWLIBPATH  = 
-LIBPATH386 =
+LIBPATH386 = 
 LIBPATH = 
-!else                                                                                                                          #!ifdef CODEWARRIOR
+!else                                                                                  # !ifdef CODEWAR
 !error Please define the tools base directory before proceeding
-!endif                                                                                                                         #!ifdef CODEWARRIOR
-!endif                                                                                                                         #!ifdef WATCOM
+!endif                                                                                 # !ifdef CODEWAR
 
 !ifndef BASE_LIBRARIES
 !ifdef WATCOM
-BASE_LIBRARIES = Library plib3s.lib,math3s.lib,clib3s.lib
-!else
-!ifdef CODEWARRIOR
+BASE_LIBRARIES = Library plib3s.lib, math3s.lib, clib3s.lib
+!endif                                                                                 # !ifdef WATCOM
+!ifdef CODEWAR
 BASE_LIBRARIES = 
-!endif                                                                                                                         #!ifdef CODEWARRIOR
-!endif                                                                                                                         #!ifdef WATCOM  
-!endif                                                                                                                         #!ifndef BASE_LIBRARIES
+!endif                                                                                 # !ifdef CODEWAR
+!endif                                                                                 # !ifndef BASE_LIBRARIES
+
 
-COPYRIGHT = Copyright 2001 by Novell, Inc. All rights reserved.
+COPYRIGHT = Copyright (C) 2000-01, 2002 Novell, Inc. All Rights Reserved.
 
 EXPORTS = Export @perl.imp
 
@@ -397,7 +444,7 @@ EXPORTS = Export @perl.imp
 # Set these to wherever you want "nmake install" to put your
 # newly built perl.
 #
-INST_DRV       = c:
+INST_DRV       = C:
 INST_TOP       = $(INST_DRV)\perl
 
 INST_NW_DRV = i:
@@ -415,7 +462,7 @@ INST_NW_TOP2 = $(INST_NW_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER       = \5.7.2
+INST_VER       = \5.17.2
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -432,6 +479,7 @@ INST_ARCH   = \$(ARCHNAME)
 # uncomment to enable multiple interpreters.  This is need for fork()
 # emulation.
 #
+
 USE_MULTI      = define
 
 #
@@ -453,16 +501,6 @@ USE_IMP_SYS        = define
 #USE_PERLIO    = define
 #USE_STDIO = define
 
-#
-# WARNING! This option is deprecated and will eventually go away (enable
-# USE_ITHREADS instead).
-#
-# uncomment to enable threads-capabilities.  This is incompatible with
-# USE_ITHREADS, and is only here for people who may have come to rely
-# on the experimental Thread support that was in 5.005.
-#
-#USE_5005THREADS= define
-
 # For now let this be here
 #
 #CRYPT_SRC     = fcrypt.c
@@ -503,14 +541,6 @@ CRYPT_FLAG = -DHAVE_DES_FCRYPT
 PERL_MALLOC    = undef
 !ENDIF
 
-!IF "$(USE_5005THREADS)" == ""
-USE_5005THREADS        = undef
-!ENDIF
-
-!IF "$(USE_5005THREADS)" == "define"
-USE_ITHREADS   = undef
-!ENDIF
-
 !IF "$(USE_IMP_SYS)" == "define"
 PERL_MALLOC    = undef
 !ENDIF
@@ -531,16 +561,15 @@ USE_IMP_SYS       = undef
 USE_PERLCRT    = undef
 !ENDIF
 
-!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef"
+!IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef"
 USE_MULTI      = define
 !ENDIF
 
 !IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef"
 USE_MULTI      = define
-USE_5005THREADS        = undef
 !ENDIF
 
-!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
+!IF "$(USE_MULTI)" != "undef"
 BUILDOPT       = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -552,17 +581,13 @@ BUILDOPT  = $(BUILDOPT) -DPERL_IMPLICIT_SYS
 PROCESSOR_ARCHITECTURE = x86
 !ENDIF
 
-!IF "$(USE_5005THREADS)" == "define"
-ARCHNAME       = NetWare-$(PROCESSOR_ARCHITECTURE)-thread
-!ELSE
 !IF "$(USE_MULTI)" == "define"
 ARCHNAME       = NetWare-$(PROCESSOR_ARCHITECTURE)-multi
 !ELSE
 ARCHNAME       = NetWare-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
-!ENDIF
 
-!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
+!IF "$(USE_MULTI)" != "undef"
 ADD_BUILDOPT   = $(ADD_BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -583,6 +608,7 @@ ARCHNAME            = $(ARCHNAME)-perlio
 #ADD_BUILDOPT  = $(ADD_BUILDOPT) -DUSE_STDIO
 !ENDIF
 
+
 ARCHDIR                = ..\lib\$(ARCHNAME)
 COREDIR                = ..\lib\CORE
 AUTODIR                = ..\lib\auto
@@ -617,7 +643,7 @@ o = .obj
 # Rules
 # 
 
-.SUFFIXES : .c $(o) .nlm .lib .nlp
+.SUFFIXES : .c $(o) .nlm .lib .NLM
 
 
 #
@@ -634,14 +660,11 @@ PL2BAT            = ..\win32\bin\pl2bat.pl
 UTILS          =                       \
                ..\utils\h2ph           \
                ..\utils\splain         \
-               ..\utils\dprofpp        \
                ..\utils\perlbug        \
                ..\utils\pl2pm          \
                ..\utils\c2ph           \
                ..\utils\h2xs           \
                ..\utils\perldoc        \
-               ..\utils\perlcc         \
-               ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
                ..\pod\pod2man          \
@@ -653,6 +676,7 @@ UTILS               =                       \
                ..\x2p\s2p              
 
 MAKE           = nmake -nologo
+#NMAKE       = $(C_COMPILER) $(INCLUDE) $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(ERROR_FLAG) $(*F).c -o $@
 
 XCOPY          = xcopy /f /r /i /d
 RCOPY          = xcopy /f /r /i /e /d
@@ -662,8 +686,7 @@ NULL                =
 #
 # filenames given to xsubpp must have forward slashes (since it puts
 # full pathnames in #line strings)
-XSUBPP         = ..\$(MINIPERL) -I..\..\lib ..\$(EXTUTILSDIR)\xsubpp \
-               -C++ -prototypes
+XSUBPP         = ..\$(MINIPERL) -I..\..\lib ..\$(EXTUTILSDIR)\xsubpp -C++ -prototypes
 
 MICROCORE_SRC  =               \
                ..\av.c         \
@@ -673,8 +696,11 @@ MICROCORE_SRC      =               \
                ..\dump.c       \
                ..\globals.c    \
                ..\gv.c         \
+               ..\mro.c        \
                ..\hv.c         \
+               ..\keywords.c   \
                ..\locale.c     \
+                ..\mathoms.c    \
                ..\mg.c         \
                ..\numeric.c    \
                ..\op.c         \
@@ -685,19 +711,19 @@ MICROCORE_SRC     =               \
                ..\pp_ctl.c     \
                ..\pp_hot.c     \
                ..\pp_pack.c    \
+               ..\pp_sort.c    \
                ..\pp_sys.c     \
+               ..\reentr.c     \
                ..\regcomp.c    \
                ..\regexec.c    \
                ..\run.c        \
                ..\scope.c      \
-               ..\sharedsv.c   \
                ..\sv.c         \
                ..\taint.c      \
                ..\toke.c       \
                ..\universal.c  \
                ..\utf8.c       \
-               ..\util.c       \
-               ..\xsutils.c
+               ..\util.c
 
 #EXTRACORE_SRC = $(EXTRACORE_SRC) perllib.c
 
@@ -744,7 +770,6 @@ CORE_NOCFG_H        =               \
                ..\proto.h      \
                ..\regexp.h     \
                ..\scope.h      \
-               ..\sharedsv.h   \
                ..\sv.h         \
                ..\thread.h     \
                ..\unixish.h    \
@@ -754,17 +779,17 @@ CORE_NOCFG_H      =               \
                ..\XSUB.h       \
                ..\EXTERN.h     \
                ..\perlvars.h   \
-               ..\intrpvar.h   \
-               ..\thrdvar.h
-
+               ..\intrpvar.h
+               
 CORE_H         = $(CORE_NOCFG_H) .\config.h
 
 DLL_OBJ                = $(DLL_SRC:.c=.obj)
 X2P_OBJ                = $(X2P_SRC:.c=.obj)
 
-DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
-               Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
-               Storable/Storable List/Util MIME/Base64/Base64 XS/Typemap/Typemap
+DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attributes B re \
+               Data/Dumper Devel/Peek ByteLoader File/Glob \
+               Storable/Storable List/Util MIME/Base64/Base64 XS/APItest/APItest \
+               XS/Typemap/Typemap Unicode/Collate/Collate Unicode/Normalize/Normalize Sys/Hostname
 
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
@@ -776,21 +801,25 @@ OPCODE            = $(EXTDIR)\Opcode\Opcode
 SDBM_FILE      = $(EXTDIR)\SDBM_File\SDBM_File
 IO                     = $(EXTDIR)\IO\IO
 POSIX          = $(EXTDIR)\POSIX\POSIX
-ATTRS          = $(EXTDIR)\attrs\attrs
-THREAD         = $(EXTDIR)\Thread\Thread
+ATTRIBUTES             = $(EXTDIR)\attributes\attributes
 B                      = $(EXTDIR)\B\B
 RE                     = $(EXTDIR)\re\re
 DUMPER         = $(EXTDIR)\Data\Dumper\Dumper
 ERRNO          = $(EXTDIR)\Errno\Errno
 PEEK           = $(EXTDIR)\Devel\Peek\Peek
 BYTELOADER     = $(EXTDIR)\ByteLoader\ByteLoader
-DPROF          = $(EXTDIR)\Devel\DProf\DProf
 GLOB           = $(EXTDIR)\File\Glob\Glob
+HOSTNAME       = $(EXTDIR)\Sys\Hostname\Hostname
 CWD                    = $(EXTDIR)\Cwd\Cwd
-STORABLE       = $(EXTDIR)\Storable\Storable
-LISTUTIL       = $(EXTDIR)\List\Util
-MIMEBASE64     = $(EXTDIR)\MIME\Base64\Base64
-XSTYPEMAP      = $(EXTDIR)\XS\Typemap\Typemap
+STORABLE               = $(EXTDIR)\Storable\Storable
+LISTUTIL               = $(EXTDIR)\List\Util
+MIMEBASE64             = $(EXTDIR)\MIME\Base64\Base64
+XSAPITEST              = $(EXTDIR)\XS\APItest\APItest
+XSTYPEMAP              = $(EXTDIR)\XS\Typemap\Typemap
+UNICODENORMALIZE       = $(EXTDIR)\Unicode\Normalize\Normalize
+UNICODECOLLATE = $(EXTDIR)\Unicode\Collate\Collate
+
+ERRNO_PM_NW    = $(LIBDIR)\Errno.pm
 
 EXTENSION_C    =               \
                $(SOCKET).c     \
@@ -799,20 +828,24 @@ EXTENSION_C       =               \
                $(SDBM_FILE).c  \
                $(IO).c         \
                $(POSIX).c      \
-               $(ATTRS).c      \
-               $(THREAD).c     \
+               $(ATTRIBUTES).c \
                $(RE).c         \
                $(DUMPER).c     \
                $(PEEK).c       \
                $(B).c          \
                $(BYTELOADER).c \
-               $(DPROF).c      \
                $(GLOB).c       \
+               $(HOSTNAME).c \
                $(CWD).c        \
                $(STORABLE).c   \
                $(LISTUTIL).c   \
                $(MIMEBASE64).c \
+               $(XSAPITEST).c  \
                $(XSTYPEMAP).c  \
+               $(UNICODENORMALIZE).c   \
+
+EXTENSION_NPM =        \
+               $(ERRNO_PM_NW)  \
 
 POD2HTML       = $(PODDIR)\pod2html
 POD2MAN                = $(PODDIR)\pod2man
@@ -823,7 +856,7 @@ POD2TEXT    = $(PODDIR)\pod2text
 # Top targets
 #
 
-all : .cleanoldfiles .\nwconfig.h $(CONFIGPM) $(NLM_NAME) $(EXTENSION_NLP) $(EXTENSION_NPM) $(TEST_NLMS) $(NETWARE_EXTNS)
+all : .cleanoldfiles .\nwconfig.h $(CONFIGPM) $(NLM_NAME) $(EXTENSION_NLM) $(EXTENSION_NPM) $(TEST_NLMS) $(NETWARE_EXTNS)
 
 #------------------------------------------------------------
 
@@ -831,15 +864,14 @@ all : .cleanoldfiles .\nwconfig.h $(CONFIGPM) $(NLM_NAME) $(EXTENSION_NLP) $(EXT
        $(MINIPERL) -I..\lib config_sh.PL $(NW_CFG_VARS) config.nw5 > ..\config.sh
 
 # this target is for when changes to the main config.sh happen
-# edit config.{b,v,g,w}c and make this target once for each supported
-# compiler (e.g. `dmake CCTYPE=BORLAND regen_config_h`)
+# edit config.wc and make this target
 regen_config_h:
        perl config_sh.PL $(NW_CFG_VARS) $(NW_CFGSH_TMPL) > ..\config.sh
        cd ..
-       -del /f perl.exe
+       -del /f /q perl.exe
        perl configpm
        cd netware
-       -del /f $(NW_CFGH_TMPL)
+       -del /f /q $(NW_CFGH_TMPL)
        -mkdir $(COREDIR)
        -perl -I..\lib config_h.PL "INST_VER=$(INST_VER)"
        rename config.h $(NW_CFGH_TMPL)
@@ -853,6 +885,7 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
        if exist include\* $(RCOPY) include $(COREDIR)\*.*
        $(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)" \
            || $(MAKE) /$(MAKEFLAGS) $(CONFIGPM)
+        @echo CONFIGPM Done
 
 $(MINIPERL) : 
        $(error)Please build $(MINIPERL) before continuing
@@ -862,65 +895,44 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl
 
 ..\x2p\a2p$(o) : ..\x2p\a2p.c
        @echo $(MPKMESSAGE)...$(BLDMESG)...$@
-       @$(C_COMPILER) -I..\x2p $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err ..\x2p\a2p.c
+       $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) -I..\x2p $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@
+    @echo Built $(@)
 
 ..\x2p\hash$(o) : ..\x2p\hash.c
        @echo $(MPKMESSAGE)...$(BLDMESG)...$@
-       @$(C_COMPILER) -I..\x2p  $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS)  $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err ..\x2p\hash.c
-
+       $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) -I..\x2p $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@
+    @echo Built $(@)
+       
 ..\x2p\str$(o) : ..\x2p\str.c
        @echo $(MPKMESSAGE)...$(BLDMESG)...$@
-       @$(C_COMPILER) -I..\x2p  $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err ..\x2p\str.c
+       $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) -I..\x2p $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@
+    @echo Built $(@)
 
 ..\x2p\util$(o) : ..\x2p\util.c
        @echo $(MPKMESSAGE)...$(BLDMESG)...$@
-       @$(C_COMPILER) -I..\x2p  $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err ..\x2p\util.c
+       $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) -I..\x2p $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@
+    @echo Built $(@)
 
 ..\x2p\walk$(o) : ..\x2p\walk.c
        @echo $(MPKMESSAGE)...$(BLDMESG)...$@
-       @$(C_COMPILER) -I..\x2p  $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err ..\x2p\walk.c
-
+       $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) -I..\x2p $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@
+    @echo Built $(@)
+       
 $(X2P) : $(MINIPERL) $(X2P_OBJ)
+       @echo Building $@..........
        $(MINIPERL) ..\x2p\find2perl.PL
        $(MINIPERL) ..\x2p\s2p.PL
+# Linker definitions and lining come here for CODEWARRIOR
+    @echo $(BASE_IMPORT_FILES) > $*.def
+    @echo MODULE clib >> $*.def
+    @echo Import @perl.imp >> $*.def
 !ifdef USE_XDC
        $(MPKTOOL) $(XDCFLAGS) $*.xdc
+       @echo Import Mp.imp >> $*.def
+       @echo xdcdata $*.xdc >> $*.def
 !endif
-!ifdef WATCOM
-       @$(NLM_LINK) @<<$*.link
- Form   Novell NLM 'Awk to Perl converter'
- Name   $(X2P)
-  Option Quiet
- Option Version = $(NLM_VERSION)
- Option Copyright '$(COPYRIGHT)'
- Option Caseexact
- Option Map=$*.map, Verbose, screenname 'System Console'
- Option Stack=32k
- Option SYMFILE=$*.sym
-!ifdef USE_XDC
- OPTION        XDCDATA=$*.xdc
-!endif
- Option NoDefaultLibs
- $(EXTRA_LINK_OPTION)
-!if "$(MAKE_TYPE)"=="Debug"
-   Debug novell
-   Debug codeview
-!endif
-LibPath $(LIBPATH)
- $(BASE_LIBRARIES)
- Module clib
- $(BASE_IMPORT_FNS)
- $(BASE_IMPORT_FILES)
- $(ADD_IMPORT_FNS)
-Import @perl.imp
- $(EXPORTS)
- File   $(X2P_OBJ:.obj=,) .\$(BLDDIR)\clibstuf.obj
-<<KEEP
-!else
-!ifdef CODEWARRIOR     
-# Linker definitions and lining come here for CODEWARRIOR
-!endif
-!endif
+##    $(LINK) $(LDFLAGS) $(BS_CFLAGS) -desc "Awk to Perl Translator" $(X2P_OBJ) $(BLDDIR)\clibstuf.obj -commandfile $*.def -o $@ 
+    $(LINK) $(LDFLAGS) -desc "Awk to Perl Translator" $(X2P_OBJ) $(BLDDIR)\clibstuf.obj -commandfile $*.def -o $@ 
 
 $(EXTDIR)\DynaLoader\dl_netware.xs: dl_netware.xs
        copy dl_netware.xs $(EXTDIR)\DynaLoader\dl_netware.xs
@@ -930,7 +942,7 @@ HEADERS :
        @copy << stdio.h >\nul
 
 /*
- * Copyright Â© 2001 Novell, Inc. All Rights Reserved.
+ * Copyright (C) 2000-01 Novell, Inc. All Rights Reserved.
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Artistic License, as specified in the README file.
@@ -942,7 +954,7 @@ HEADERS :
  * DESCRIPTION :       Generated header file, do not edit. See makefile.
  *                  This header file causes the includer to use clibstuf.h
  *                  The purpose of clibstuf is to make sure that Perl, cgi2perl and
- *                  all the perl extension nlm's (*.NLP) use the Novell Netware CLIB versions
+ *                  all the perl extension nlm's (*.NLM) use the Novell Netware CLIB versions
  *                  of standard functions. This code loads up a whole bunch of function pointers
  *                  to point at the standard CLIB functions.
  * Author              :       HYAK
@@ -967,7 +979,7 @@ HEADERS :
        @copy << string.h >\nul
 
 /*
- * Copyright Â© 2001 Novell, Inc. All Rights Reserved.
+ * Copyright (C) 2000-01 Novell, Inc. All Rights Reserved.
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Artistic License, as specified in the README file.
@@ -979,7 +991,7 @@ HEADERS :
  * DESCRIPTION :       Generated header file, do not edit. See makefile.
  *                  This header file causes the includer to use clibstuf.h
  *                  The purpose of clibstuf is to make sure that Perl, cgi2perl and
- *                  all the perl extension nlm's (*.NLP) use the Novell Netware CLIB versions
+ *                  all the perl extension nlm's (*.NLM) use the Novell Netware CLIB versions
  *                  of standard functions. This code loads up a whole bunch of function pointers
  *                  to point at the standard CLIB functions.
  * Author              :       HYAK
@@ -1002,98 +1014,65 @@ HEADERS :
        @copy string.h $(COREDIR)
 
 
-$(NLM_NAME): MESSAGE HEADERS $(BLDDIR)\nul $(NLM_OBJ) $(NEWTARE_OBJ_DEP) $(PERL_IO_OBJ_DEP) $(PERL_LIB_OBJ_DEP) $(DLL_OBJ) .XDC $(PERLIMPLIB) $(EXT_MAIN_OBJ)
+$(NLM_NAME): MESSAGE HEADERS $(BLDDIR)\nul $(NLM_OBJ) $(NEWTARE_OBJ_DEP) $(NEWTARE_CPP_OBJ_DEP) $(PERL_IO_OBJ_DEP) $(DLL_OBJ) \
+            $(PERLIMPLIB) $(EXT_MAIN_OBJ) $(PERL_TEMP_OBJ) #$(PERL_LIB_OBJ) 
        @echo======= Linking $@ at $(MAKEDIR)\$(BLDDIR) =======
-!ifdef WATCOM
-       @$(NLM_LINK) @<<$(BLDDIR)\$*.link
- Form   Novell NLM '$(NLM_DESCRIPTION)'
- Name   $(BUILT)
- Option Quiet
- Option Version = $(NLM_VERSION)
- Option Copyright '$(COPYRIGHT)'
- Option Caseexact
- Option Map=$(BLDDIR)\$(NLM_NAME8).map, Verbose, screenname $(SCREEN)
- Option Stack=1000
-!ifdef NLM_NAME8
- Option SYMFILE=$(BLDDIR)\$(NLM_NAME8).sym
-!ifdef USE_XDC
- OPTION        XDCDATA=$(BLDDIR)\$(NLM_NAME8).xdc
-!endif
-!else
- Option SYMFILE=$(BLDDIR)\$(NLM_NAME).sym
-!ifdef USE_XDC
- OPTION        XDCDATA=$(BLDDIR)\$(NLM_NAME).xdc
-!endif
-!endif
- Option NoDefaultLibs
- $(EXTRA_LINK_OPTION)
-!if "$(MAKE_TYPE)"=="Debug"
-   # Debug all
-   Debug novell
-   Debug codeview
-!endif
-LibPath $(LIBPATH)
- $(BASE_LIBRARIES)
- Module clib
- $(BASE_IMPORT_FNS)
- $(BASE_IMPORT_FILES)
- $(ADD_IMPORT_FNS)
-Import @perl.imp
- $(EXPORTS)
- File   $(NEWTARE_OBJ_DEP:.obj=.obj,) $(NLM_OBJ:.obj=.obj,) $(PERL_IO_OBJ_DEP:.obj=.obj,) $(PERL_LIB_OBJ_DEP:.obj=.obj,) $(DLL_OBJ:.obj=.obj,)
-<<KEEP
-!else
-!ifdef CODEWARRIOR     
 # Linker definitions and lining come here for CODEWARRIOR
-!endif
-!endif
-       copy ..\win32\splittree.pl .. 
-       $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
-
-
-!if "$(MAKE_TYPE)"=="Debug"
+       @echo $(BASE_IMPORT_FILES) > $*.def
+       @echo MODULE clib >> $*.def
+       @echo MODULE netdb >> $*.def
+!ifdef SECURITYBASE
+   @echo MODULE nwsec >> $*.def
+!endif                                                                                 #!ifdef SECURITYBASE
+       @echo $(EXPORTS) >> $*.def
+!ifdef USE_XDC
+       @echo======= Creating XDC file
+       @echo Import Mp.imp >> $*.def
 !ifdef NLM_NAME8
-       .\bat\cvpack $(BLDDIR)\$(NLM_NAME8).sym
+       $(MPKTOOL) $(XDCFLAGS) $(BLDDIR)\$(NLM_NAME8).xdc
+       @echo xdcdata $(BLDDIR)\$(NLM_NAME8).xdc >> $*.def
 !else
-       .\bat\cvpack $(BLDDIR)\$(NLM_NAME).sym
+       $(MPKTOOL) $(XDCFLAGS) $(BLDDIR)\$(NLM_NAME).xdc
+       @echo xdcdata $(BLDDIR)\$(NLM_NAME).xdc >> $*.def 
 !endif
 !endif
+##    $(LINK) $(LDFLAGS) $(BS_CFLAGS) -desc "Perl 5.6.1 for NetWare" $(NEWTARE_OBJ_DEP:.obj=.obj) $(NLM_OBJ:.obj=.obj) $(PERL_IO_OBJ_DEP:.obj=.obj) $(DLL_OBJ:.obj=.obj) $(NEWTARE_CPP_OBJ_DEP:.obj=.obj) -commandfile $*.def -o .\$(BLDDIR)\$@
+       $(LINK) $(LDFLAGS) -desc $(MODULE_DESC) $(NEWTARE_OBJ_DEP:.obj=.obj) $(NLM_OBJ:.obj=.obj) $(PERL_IO_OBJ_DEP:.obj=.obj) $(DLL_OBJ:.obj=.obj) $(NEWTARE_CPP_OBJ_DEP:.obj=.obj) -commandfile $*.def -o .\$(BLDDIR)\$@
+       copy splittree.pl .. 
+       $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
+       @echo ========Linked $@ ==========
 
        @echo======= Finished building $(BUILT).
-# Create the debug\release directory if not existing
+
+# Create the debug or release directory if not existing
 $(BLDDIR)\nul:
-       @echo . . . . mkdir $(BLDDIR)
-       @mkdir $(BLDDIR)
+       @echo . . . . mkdir $(BLDDIR)
+       @mkdir $(BLDDIR)
+       @echo '$(BLDDIR)' directory created.
 
 MESSAGE: 
        @echo======= $(MAKE_ACTION)ing $(NLM_NAME) at $(MAKEDIR)\$(BLDDIR) ======= 
-
-.XDC:
-!ifdef USE_XDC
-        @echo======= Creating XDC file
-!ifdef NLM_NAME8
-        $(MPKTOOL) $(XDCFLAGS) $(BLDDIR)\$(NLM_NAME8).xdc
-!else
-        $(MPKTOOL) $(XDCFLAGS) $(BLDDIR)\$(NLM_NAME).xdc
-!endif
-!endif
-
-$(PERLIMPLIB): perllib.def
-       $(NLM_LIB) -def:perllib.def -out:$(PERLIMPLIB)
-       $(XCOPY) $(PERLIMPLIB) $(COREDIR)
-
-perllib.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl
-       $(MINIPERL) -w ..\makedef.pl PLATFORM=netware FILETYPE=def $(BS_CFLAGS) $(DEFINES) $(ADD_BUILDOPT) \
-           CCTYPE=$(CCTYPE) > perllib.def
-       $(MINIPERL) -w ..\makedef.pl PLATFORM=netware FILETYPE=imp $(BS_CFLAGS) $(DEFINES) $(ADD_BUILDOPT) \
-           CCTYPE=$(CCTYPE) > perl.imp
-
+  
+$(PERLIMPLIB): perllib.imp
+#    @echo Building $(PERLIMPLIB)...
+#    $(LD) -type library $(NLM_OBJ) $(BLDDIR)\nw5.obj $(BLDDIR)\nwmain.obj $(BLDDIR)\nw5thread.obj $(BLDDIR)\nwtinfo.obj \
+#    $(BLDDIR)\nwutil.obj $(BLDDIR)\interface.obj $(BLDDIR)\perllib.obj $(PERL_IO_OBJ_DEP) $(DLL_OBJ) -o $@
+#      $(XCOPY) $(PERLIMPLIB) $(COREDIR)
+#      @echo $(PERLIMPLIB) Done
+
+perllib.imp : $(MINIPERL) $(CONFIGPM) ..\embed.fnc ..\makedef.pl
+#      $(MINIPERL) -w ..\makedef.pl PLATFORM=netware FILETYPE=def $(ADD_BUILDOPT) \
+#          CCTYPE=$(CCTYPE) TARG_DIR=..\ > perllib.def
+       @echo (Perl) > perl.imp
+       $(MINIPERL) -w ..\makedef.pl PLATFORM=netware FILETYPE=imp $(BS_CFLAGS) $(DEFINES) $(ADD_BUILDOPT) \
+           CCTYPE=$(CCTYPE) TARG_DIR=..\ >> perl.imp
+       copy perl.imp $(COREDIR)
+  
 $(DLL_OBJ) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
-       @echo $(MPKMESSAGE)...$(BLDMESG)...$@
-       @$(C_COMPILER) @<<$(BLDDIR)\$(*F).options 
-       $(NLM_INCLUDES) -I$(EXTDIR)\DynaLoader\ $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$(BLDDIR)\$(*F).err $(EXTDIR)\DynaLoader\$(*F).c
-<<KEEP
+       @echo $(MPKMESSAGE)...$(BLDMESG)...$@
+       @$(C_COMPILER) $(NLM_INCLUDES) $(COMPLER_FLAGS) $(NLM_INCLUDES) $(ADD_LOCDEFS) $(ERROR_FLAG) -I$(EXTDIR)\DynaLoader \
+       $(EXTDIR)\DynaLoader\$(*F).c -o $@
+       @echo $(@) Done.
 
 $(DYNALOADER).c : $(MINIPERL) $(EXTDIR)\DynaLoader\dl_netware.xs $(CONFIGPM)
        if not exist $(AUTODIR) mkdir $(AUTODIR)
@@ -1106,51 +1085,51 @@ $(DYNALOADER).c : $(MINIPERL) $(EXTDIR)\DynaLoader\dl_netware.xs $(CONFIGPM)
        cd $(EXTDIR)\$(*B)
        $(XSUBPP) dl_netware.xs > $(*B).c
        cd ..\..\netware
+       @echo Dynaloader Done
 
-$(PERL_LIB_OBJ_DEP) : $(NW_HOST_H_FILES) $(*F).c
-       @echo $(MPKMESSAGE)...$(BLDMESG)...$@
-       @$(CPP_COMPILER) @<<$(BLDDIR)\$(*F).options 
-       -I.. $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err $(*F).c
-<<KEEP
 
 $(PERL_IO_OBJ_DEP) : ..\$(*F).c
        @echo $(MPKMESSAGE) $(BLDMESG) $@
-       @$(C_COMPILER) @<<$(BLDDIR)\$(*F).options 
-       $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err ..\$(*F).c
-<<KEEP
+       $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) $(ADD_LOCDEFS) $(ERROR_FLAG) ..\$(*F).c -o $@
+       @echo Built $(@)
 
 $(NLM_OBJ)     : ..\$(*F).c
        @echo $(MPKMESSAGE) $(BLDMESG) $@
-       @$(C_COMPILER) @<<$(BLDDIR)\$(*F).options 
-       $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err ..\$(*F).c
-<<KEEP
-
+       $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) $(ADD_LOCDEFS) $(ERROR_FLAG) ..\$(*F).c -o $@
+       @echo Built $(@)
+       
+    
 $(NEWTARE_OBJ_DEP) : $(NW_H_FILES) $(NW_HOST_H_FILES) $(*F).c
        @echo $(MPKMESSAGE) $(BLDMESG) $@
-       @$(C_COMPILER) @<<$(BLDDIR)\$(*F).options 
-       $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err $(*F).c
-<<KEEP
+       $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) $(ADD_LOCDEFS) $(ERROR_FLAG) $(*F).c -o $@
+    @echo Built $(@)
 
-$(EXT_MAIN_OBJ) : $(CLIB_H_FILES)
+$(NEWTARE_CPP_OBJ_DEP) : $(NW_H_FILES) $(NW_HOST_H_FILES) $(*F).cpp
        @echo $(MPKMESSAGE) $(BLDMESG) $@
-       @$(C_COMPILER) @<<$(BLDDIR)\$(*F).options
-       $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err $(*F).c
-<<KEEP
-       $(NLM_LIB) $@ $(NLMIMPORTS)\prelude.obj -out:$*.lib
-       @copy $*.lib $(COREDIR)
+       $(C_COMPILER) $(CWCPPFLAGS) $(COMPLER_FLAGS) $(NLM_INCLUDES) $(ADD_LOCDEFS) $(ERROR_FLAG) $(*F).cpp -o $@
+    @echo Built $(@)
+
+$(EXT_MAIN_OBJ) : $(CLIB_H_FILES)
+    @echo $(MPKMESSAGE) $(BLDMESG) $@
+    $(C_COMPILER)  $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(ERROR_FLAG) $(*F).c -o $@ 
+    $(LD) -type library $@ -o $*.lib
+    @copy $*.lib $(COREDIR)
 
 # Delete any files that might have got created during building miniperl.exe
 # config.sh will definitely be created
 # COREDIR might have got created
 .cleanoldfiles :
-       -del ..\config.sh
-       -del .\Main.obj
-       -del .\Main.lib
+       -del /f /q $(PERLIMPLIB)
+       -del /f /q ..\lib\config.pm
+       -del /f /q ..\config.sh
+       -del /f /q .\Main.obj
+       -del /f /q .\Main.lib
        -rmdir /s /q $(AUTODIR)
        -rmdir /s /q $(COREDIR)
+       -del /f /q ..\lib\core
 
 .\nwconfig.h : $(NW_CFGH_TMPL)
-       -del /f config.h
+       @if exist .\config.h del /f /q .\config.h
        copy $(NW_CFGH_TMPL) config.h
 
 # REQUIRED WHEN WE INCLUDE CONFIGPM OR REGEN_CONFIG - sgp
@@ -1158,240 +1137,226 @@ $(EXT_MAIN_OBJ) : $(CLIB_H_FILES)
 #      $(MINIPERL) -I..\lib config_sh.PL $(NW_CFG_VARS) config.nw5 > ..\config.sh
 #      @pause
 #      cd ..
-#      del config.sh
+#      del /f /q config.sh
 #      rename nwconfig.sh config.sh
 #      cd netware
 
 config.nw5 : $(NW_CFGSH_TMPL)
        copy $(NW_CFGSH_TMPL) config.nw5
 
-$(SOCKET_NLP): $(NLM_NAME) $(SOCKET).xs
+$(SOCKET_NLM): $(NLM_NAME) $(SOCKET).xs
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(FCNTL_NLP):
+$(HOSTNAME_NLM): $(NLM_NAME) $(HOSTNAME).xs
+       cd $(EXTDIR)\Sys\$(*B)
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\..\netware
+
+$(FCNTL_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(IO_NLP):
+$(IO_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(OPCODE_NLP):
+$(OPCODE_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(B_NLP):
+$(B_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(DUMPER_NLP):
+$(DUMPER_NLM):
        cd $(EXTDIR)\Data\$(*B)
-       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\..\netware
 
-$(PEEK_NLP):
+$(PEEK_NLM):
        cd $(EXTDIR)\Devel\$(*B)
-       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\..\netware
 
-$(RE_NLP):
+$(RE_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(BYTELOADER_NLP):
+$(BYTELOADER_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(DPROF_NLP):
-       cd $(EXTDIR)\Devel\$(*B)
-       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
-       $(MAKE)
-       cd ..\..\..\netware
-
-$(GLOB_NLP):
+$(GLOB_NLM):
        cd $(EXTDIR)\File\$(*B)
-       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\..\netware
 
-$(POSIX_NLP):
+$(POSIX_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(THREAD_NLP):
+$(ATTRIBUTES_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(ATTRS_NLP):
+$(SDBM_FILE_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(SDBM_FILE_NLP):
+$(CWD_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(CWD_NLP):
+$(STORABLE_NLM):
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
-$(STORABLE_NLP):
-       cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-       $(MAKE)
-       cd ..\..\netware
-
-$(LISTUTIL_NLP):
+$(LISTUTIL_NLM):
        cd $(EXTDIR)\List\$(*B)
-       ..\..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\..\netware
 
-$(MIMEBASE64_NLP):
+$(MIMEBASE64_NLM):
        cd $(EXTDIR)\Mime\$(*B)
-       ..\..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\..\netware
+
+$(XSAPITEST_NLM):
+       cd $(EXTDIR)\XS\$(*B)
+       ..\..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\..\netware
 
-$(XSTYPEMAP_NLP):
+$(XSTYPEMAP_NLM):
        cd $(EXTDIR)\XS\$(*B)
-       ..\..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\..\netware
+
+$(UNICODENORMALIZE_NLM):
+       cd $(EXTDIR)\Unicode\$(*B)
+       ..\..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\..\netware
 
+
 $(ERRNO_PM_NW):
+#      @echo Building $@
        cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 
 $(ECHO_SRC_OBJ): $*.c
        @echo $(MPKMESSAGE) $(BLDMESG) $@
-       @$(C_COMPILER) @<<$*.options 
-       $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err $*.c
-<<KEEP
+       $(C_COMPILER) $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@
+       @echo Built $(@)
 
 $(ECHO_NLM): $(ECHO_SRC_OBJ)
        @echo======= Linking $@ =======
+# Linker definitions and lining come here for CODEWARRIOR
+    @echo $(BASE_IMPORT_FILES) > $*.def
+    @echo MODULE clib >> $*.def
+    @echo Import @perl.imp >> $*.def
 !ifdef USE_XDC
        $(MPKTOOL) $(XDCFLAGS) $*.xdc
+       @echo Import @MP.imp >> $*.def
+       @echo xdcdata $*.xdc >> $*.def 
 !endif
-!ifdef WATCOM
-       @$(NLM_LINK) @<<$*.link
- Form   Novell NLM 'DOS echo emulation for Perl Testing' Name $@ 
- Option Quiet Option Version = $(NLM_VERSION) Option Copyright '$(COPYRIGHT)' Option Caseexact Option Map=$*.map, Verbose, screenname 'System Console' Option Stack=1000 Option SYMFILE=$*.sym  Option NoDefaultLibs
-!ifdef USE_XDC
- OPTION        XDCDATA=$*.xdc
-!endif
- $(EXTRA_LINK_OPTION)
-!if "$(MAKE_TYPE)"=="Debug"
-   Debug novell
-   Debug codeview
-!endif
-LibPath $(LIBPATH)
- $(BASE_LIBRARIES) Module clib $(BASE_IMPORT_FNS) $(BASE_IMPORT_FILES) $(ADD_IMPORT_FNS)
-Import @perl.imp
- $(EXPORTS)
- File   $(ECHO_SRC_OBJ:.obj=.obj,) .\$(BLDDIR)\clibstuf.obj
-<<KEEP
-!else
-!ifdef CODEWARRIOR     
-# Linker definitions and lining come here for CODEWARRIOR
-!endif
-!endif
+##    $(LINK) $(LDFLAGS) $(BS_CFLAGS) -desc "DOS Echo emulation for Perl testing" $(ECHO_SRC_OBJ) $(BLDDIR)\clibstuf.obj -commandfile $*.def -o $@
+    $(LINK) $(LDFLAGS) -desc "DOS Echo emulation for Perl testing" $(ECHO_SRC_OBJ) $(BLDDIR)\clibstuf.obj -commandfile $*.def -o $@
        @echo======= Linking Complete =======
 
 $(TYPE_SRC_OBJ): $*.c
        @echo $(MPKMESSAGE) $(BLDMESG) $@
-       @$(C_COMPILER) @<<$*.options 
-       $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(OBJOUT_FLAG)$@ $(ERROR_FLAG)$*.err $*.c
-<<KEEP
-
+       $(C_COMPILER) $(NLM_INCLUDES) $(COMPLER_FLAGS) $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@
+       @echo Built $(@)
+       
 $(TYPE_NLM): $(TYPE_SRC_OBJ)
        @echo======= Linking $@ =======
+# Linker definitions and lining come here for CODEWARRIOR
+    @echo $(BASE_IMPORT_FILES) > $*.def
+    @echo MODULE clib >> $*.def
+    @echo Import @perl.imp >> $*.def
 !ifdef USE_XDC
        $(MPKTOOL) $(XDCFLAGS) $*.xdc
+       @echo Import @MP.imp >> $*.def 
+       @echo xdcdata $*.xdc >> $*.def 
 !endif
-!ifdef WATCOM
-       @$(NLM_LINK) @<<$*.link
- Form   Novell NLM 'DOS type emulation for Perl Testing' Name $@ 
- Option Quiet Option Version = $(NLM_VERSION) Option Copyright '$(COPYRIGHT)' Option Caseexact Option Map=$*.map, Verbose, screenname 'System Console' Option Stack=1000 Option SYMFILE=$*.sym
-!ifdef USE_XDC
- OPTION        XDCDATA=$*.xdc
-!endif
- Option NoDefaultLibs
- $(EXTRA_LINK_OPTION)
-!if "$(MAKE_TYPE)"=="Debug"
-   Debug novell
-   Debug codeview
-!endif
-LibPath $(LIBPATH)
- $(BASE_LIBRARIES) Module clib $(BASE_IMPORT_FNS) $(BASE_IMPORT_FILES) $(ADD_IMPORT_FNS)
-Import @perl.imp
- $(EXPORTS)
- File   $(TYPE_SRC_OBJ:.obj=.obj,) .\$(BLDDIR)\clibstuf.obj
-<<KEEP
-!else
-!ifdef CODEWARRIOR     
-# Linker definitions and lining come here for CODEWARRIOR
-!endif
-!endif
+##    $(LINK) $(LDFLAGS) $(BS_CFLAGS) -desc "DOS Type emulation for Perl testing" $(TYPE_SRC_OBJ) $(BLDDIR)\clibstuf.obj -commandfile $*.def -o $@
+    $(LINK) $(LDFLAGS) -desc "DOS Type emulation for Perl testing" $(TYPE_SRC_OBJ) $(BLDDIR)\clibstuf.obj -commandfile $*.def -o $@
        @echo======= Linking Complete =======
 
+
 # Build NetWare specific extensions
-$(CGI2PERL_NLP):
+$(CGI2PERL_NLM):
 !if "$(NW_EXTNS)"=="yes"
        cd $(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       ..\..\miniperl -I..\..\lib Makefile.PL "CCCDLFLAGS=-bool on -lang c++" PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 !endif
 
-$(PERL2UCS_NLP):
+$(PERL2UCS_NLM):
 !if "$(NW_EXTNS)"=="yes"
-       cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       cd $(*B)
+       ..\..\miniperl -I..\..\lib Makefile.PL "CCCDLFLAGS=-bool on -lang c++" PERL_CORE=1 INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\netware
+!endif
+
+$(UCSExt_NLM):
+!if "$(NW_EXTNS)"=="yes"
+       cd $(*B)
+       ..\..\miniperl -I..\..\lib Makefile.PL "CCCDLFLAGS=-bool on -lang c++" PERL_CORE=1 INSTALLDIRS=perl
        $(MAKE)
        cd ..\..\netware
 !endif
 
 nwclean:
-       -rmdir /s /q $(REL_DIR) || rmdir /s $(REL_DIR)
-       -rmdir /s /q $(DEB_DIR) || rmdir /s $(DEB_DIR)
-       @if exist .\stdio.h del .\stdio.h
-       @if exist .\string.h del .\string.h
-       @if exist .\Main.obj del .\Main.obj
-       @if exist .\Main.lib del .\Main.lib
+       -rmdir /s /q $(REL_DIR)
+       -rmdir /s /q $(DEB_DIR)
+       @if exist .\stdio.h del /f /q .\stdio.h
+       @if exist .\string.h del /f /q .\string.h
+       @if exist .\config.h del /f /q .\config.h
+       @if exist .\config.nw5 del /f /q .\config.nw5
+       @if exist .\perl.imp del /f /q .\perl.imp
+       -del /f /q *.obj *.lib *.def *.sym *.map *.xdc *.err *.nlm
        cd testnlm\echo
-       -del *.obj *.map *.link *.options *.nlm *.sym *.xdc *.err
+       -del /f /q *.obj *.map *.link *.options *.nlm *.sym *.xdc *.err *.lib *.def *.pdb *.bs
        cd ..\type
-       -del *.obj *.map *.link *.options *.nlm *.sym *.xdc *.err
+       -del /f /q *.obj *.map *.link *.options *.nlm *.sym *.xdc *.err *.lib *.def *.pdb *.bs
        cd ..\..\
 
 utils: $(BLDDIR)\$(NLM_NAME8).$(NLM_EXT) $(X2P)
@@ -1402,66 +1367,76 @@ utils: $(BLDDIR)\$(NLM_NAME8).$(NLM_EXT) $(X2P)
        copy ..\README.cygwin .\perlcygwin.pod
        copy ..\README.dos .\perldos.pod
        copy ..\README.hpux .\perlhpux.pod
-#      copy ..\README.machten .\perlmachten.pod
        copy ..\README.os2 .\perlos2.pod
        copy ..\vms\perlvms.pod .\perlvms.pod
        copy ..\README.win32 .\perlwin32.pod
        copy ..\README.netware .\perlnw5.pod
        $(MAKE) -f ..\win32\pod.mak converters
+
        cd ..\netware
        $(MINIPERL) $(PL2BAT) $(UTILS)
 
 distclean: clean nwclean
-       -del /f $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
-       -del /f *.def *.map
-       -del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm
-       -del /f $(EXTDIR)\DynaLoader\dl_netware.xs
-       -del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm
-       -del /f $(LIBDIR)\XSLoader.pm
-       -del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
-       -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm $(LIBDIR)\Thread.pm
-       -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm
-       -del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm
-       -del /f $(LIBDIR)\Data\Dumper.pm $(LIBDIR)\ByteLoader.pm
-       -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm
-       -del /f $(LIBDIR)\File\Glob.pm
-       -rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO
-       -rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread
-       -rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B
-       -rmdir /s /q $(LIBDIR)\Data || rmdir /s $(LIBDIR)\Data
-       -del /f $(PODDIR)\*.html
-       -del /f $(PODDIR)\*.bat
+       -del /f /q $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
+       -del /f /q $(EXTENSION_NPM)
+       -del /f /q $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm
+       -del /f /q $(EXTDIR)\DynaLoader\dl_netware.xs
+       -del /f /q $(EXTDIR)\DynaLoader\dl_win32.xs
+       -del /f /q $(EXTDIR)\DynaLoader\DynaLoader.pm
+       -del /f /q $(EXTDIR)\DynaLoader\XSLoader.pm
+       -del /f /q $(LIBDIR)\.exists $(LIBDIR)\attributes.pm $(LIBDIR)\DynaLoader.pm
+       -del /f /q $(LIBDIR)\XSLoader.pm
+       -del /f /q $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
+       -del /f /q $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm
+       -del /f /q $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm
+       -del /f /q $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm
+       -del /f /q $(LIBDIR)\Data\Dumper.pm $(LIBDIR)\ByteLoader.pm
+       -del /f /q $(LIBDIR)\Devel\Peek.pm
+       -del /f /q $(LIBDIR)\File\Glob.pm
+       -del /f /q $(LIBDIR)\Unicode\Normalize.pm
+       -del /f /q $(LIBDIR)\Unicode\Collate.pm
+       -rmdir /s /q $(LIBDIR)\IO
+       -rmdir /s /q $(LIBDIR)\B
+       -rmdir /s /q $(LIBDIR)\Data
+       -del /f /q $(PODDIR)\*.html
+       -del /f /q $(PODDIR)\*.bat
        cd ..\utils
-       -del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc dprofpp
-       -del /f *.bat
+       -del /f /q h2ph splain perlbug pl2pm c2ph h2xs perldoc
+       -del /f /q *.bat
        cd ..\netware
        cd ..\x2p
-       -del /f find2perl s2p
-       -del /f *.bat
-       -del *.obj *.map *.link *.xdc *.err
+       -del /f /q find2perl s2p
+       -del /f /q *.bat *.exe
+       -del /f /q *.obj *.map *.link *.xdc *.err
        cd ..\netware
-       -del /f ..\config.sh ..\splittree.pl dlutils.c config.h.new
-       -del /f $(CONFIGPM)
-       -del /f bin\*.bat
+       -del /f /q ..\config.sh ..\splittree.pl dlutils.c config.h.new
+       -del /f /q $(CONFIGPM)
+       -del /f /q bin\*.bat
        cd $(EXTDIR)
-       -del /s *.lib *.def *.map *.pdb *.bs Makefile *$(o) pm_to_blib *.xdc *.err
+    -del /s /q /f *.lib *.def *.map *.pdb *.bs Makefile *$(o) pm_to_blib *.xdc *.err *.obj *.sym
        cd ..\netware
 !if "$(NW_EXTNS)"=="yes"
        cd cgi2perl
-       -del *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map
+       -del /f /q *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map *.def *.lib *.pdb
        cd ..
-       cd $(EXTDIR)\Perl2UCS
-       -del *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map *.c
+       cd Perl2UCS
+       -del /f /q *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map *.def *.lib *.pdb
+       cd ..\..\netware
+       cd UCSExt
+       -del /f /q *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map *.c
        cd ..\..\netware
 !endif
-       -rmdir /s /q $(AUTODIR) || rmdir /s $(AUTODIR)
-       -rmdir /s /q $(COREDIR) || rmdir /s $(COREDIR)
-       -del ..\config.sh
+       -rmdir /s /q $(AUTODIR)
+       -rmdir /s /q $(COREDIR)
+       -del /f /q ..\config.sh
 
 installwin:
        $(MINIPERL) -I..\lib ..\installperl
 
-install : utils installwin
+install : utils installwin perlimp
+
+perlimp :
+       copy perl.imp $(INST_COREDIR)
 
 installnw:
        $(MINIPERL) -I..\lib ..\installperl -netware
@@ -1491,4 +1466,3 @@ clean :
        -@erase ..\*$(o) ..\*.lib ..\*.exp *$(o) *.lib *.exp *.res
        -@erase ..\t\*.exe ..\t\*.dll ..\t\*.bat
        -@erase ..\x2p\*.nlm ..\x2p\*.bat
-