X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=NetWare%2FMakefile;h=9121f4f74b120157a54713ce066ed242ee5c1527;hb=b5379b0df09a1d2f8fb44659104d41784790923d;hp=813fbe929512a460086d157b8642f92988390adf;hpb=cd340a5d1de2dbc931e802b4aaed98e9e4d75f51;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/NetWare/Makefile b/NetWare/Makefile
index 813fbe9..9121f4f 100644
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -14,8 +14,8 @@
 
 ## This file is created by using the makefile that creates Windows Perl as the reference
 ## Author:
-## Date Created: 25th March 2002
-## Date Modified: 
+## Date Created: 13th July 2000
+## Date Modified: 21st March 2002
 # Name of the NLM
 
 
@@ -33,49 +33,60 @@ 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"
-!endif																#ifndef MPKBASE
+!message "Run bat\setmpksdk.bat to set the NetWare MPK SDK before continuing.\n"
+!error
+!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
-UCSINC          = p:\apps\script\sw\ucs-inc
-NLMIMPORTS      = $(NLMSDKBASE)\imports
-
-!ifndef SECURITYBASE
-SECURITYBASE		= P:\apps\script\sw\nwsec
-!message "Run bat\SetSecSdk.bat to set the Security paths before continuing.\n"
-#!error
-!endif																#!ifndef MAKE_TYPE
-SECURITY_IMPORTS	= $(SECURITYBASE)\imports
 
-    # Here comes the CW tools - TO BE FILLED TO BUILD WITH CW -
-MODULE_DESC     = "Perl 5.7.3 for NetWare"
+# Here comes the CW tools - TO BE FILLED TO BUILD WITH CW -
+MODULE_DESC     = "Perl 5.9.0 for NetWare"
 CCTYPE          = CodeWarrior
 C_COMPILER		= mwccnlm -c
 CPP_COMPILER	= mwccnlm
@@ -86,15 +97,14 @@ TOOL_HEADERS	=
 TOOL_PATH		= 
 CWCPPFLAGS      = -cpp_exceptions on -wchar_t off -bool on -w on -ansi off
 CCFLAGS			= -maxerrors 25 -processor Pentium -align packed \
-                  -w nounusedarg -msext on -sym on -sym codeview4 -sym internal \
+                  -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." \
-                  -sym on -sym codeview4 -sym internal -osym perl.sym
+                  -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"
@@ -103,22 +113,27 @@ BLDMESG	    = Debug version,
 !ifdef USE_D2
 BS_CFLAGS	= -opt off -inline off -sym on -sym codeview4 -sym internal -DDEBUGGING -DDKFBPON
 BLDMESG		= $(BLDMESG) Using /d2 option
-##LDFLAGS		= $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(BLDDIR)\$*.sym
-LDFLAGS		= $(LDFLAGS) -sym on -sym codeview4 -sym internal
-## -osym $(BLDDIR)\$(NLM_NAME8).sym
-!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
+!else												# !ifdef USE_D2
 BS_CFLAGS	= -opt off -inline off -sym on -sym codeview4 -sym internal -DDEBUGGING -DDKFBPON
 BLDMESG		= $(BLDMESG) Using /d1 option
-##LDFLAGS		= $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(BLDDIR)\$*.sym
-LDFLAGS		= $(LDFLAGS) -sym on -sym codeview4 -sym internal
-## -osym $(BLDDIR)\$(NLM_NAME8).sym
-!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"												#!ifdef CODEWARRIOR
+!endif									 			# !if "$(MAKE_TYPE)"=="Debug"
+
 
 ADD_LOCDEFS =	-DPERL_CORE
 
@@ -126,16 +141,35 @@ 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
-# SECURITY_INCLUDE	= -I$(SECURITYBASE)\include
+
+!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.
 
+
 NLM_INCLUDE_PATH = $(NLM_INCLUDE) $(NLM_INCLUDE_NLM) $(NLM_INCLUDE_NLM_SYS) $(NLM_INCLUDE_OBSLETE) \
-                   $(NLM_INCLUDE_MP) $(NLM_INCLUDE_UCS) $(TOOL_HEADERS) 
+                   $(NLM_INCLUDE_MP) $(TOOL_HEADERS)
+
+!ifdef SECURITYBASE
+NLM_INCLUDE_PATH = $(NLM_INCLUDE_PATH) $(SECURITY_INCLUDE)
+!endif											#!ifdef SECURITYBASE
+
+!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)
@@ -177,6 +211,7 @@ CLIB_H_FILES		=	\
 
 NW_SRC				=	\
 						.\CLIBstuf.c	\
+						.\sv_nw.c		\
 						.\nw5.c		\
 						.\nw5sck.c	\
 						.\nw5thread.c \
@@ -293,10 +328,19 @@ 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
 
 EXTENSION_NLM	= 		\
+		$(FCNTL_NLM)	\
+		$(BYTELOADER_NLM)	\
+		$(IO_NLM)		\
+		$(SOCKET_NLM)	\
+		$(OPCODE_NLM)	\
+		$(B_NLM)		\
+		$(ATTRS_NLM)	\
+		$(SDBM_FILE_NLM)	\
 		$(POSIX_NLM)	\
 		$(THREAD_NLM)	\
 		$(DUMPER_NLM)	\
@@ -309,21 +353,15 @@ EXTENSION_NLM	= 		\
 		$(STORABLE_NLM)		\
 		$(LISTUTIL_NLM)		\
 		$(MIMEBASE64_NLM)	\
+		$(XSAPITEST_NLM)	\
 		$(XSTYPEMAP_NLM)	\
-		$(FCNTL_NLM)	\
-		$(SOCKET_NLM)	\
-		$(OPCODE_NLM)	\
-		$(B_NLM)		\
-		$(ATTRS_NLM)	\
-		$(BYTELOADER_NLM)	\
-		$(IO_NLM)		\
-		$(UNICODENORMALIZE_NLM)   \
-		$(SDBM_FILE_NLM)	
-# Begin - Following is required to build NetWare specific extensions CGI2Perl, Perl2UCS and UCSExt
+		$(UNICODENORMALIZE_NLM)  \
+		$(FILTER_NLM)	
 
+# Begin - Following is required to build NetWare specific extensions CGI2Perl, Perl2UCS and UCSExt
 CGI2PERL		= CGI2Perl\CGI2Perl
-PERL2UCS		= $(EXTDIR)\Perl2UCS\Perl2UCS
-UCSExt			= $(EXTDIR)\Perl2UCS\UCSExt
+PERL2UCS		= Perl2UCS\Perl2UCS
+UCSExt			= Perl2UCS\UCSExt
 
 CGI2PERL_NLM = \CGI2Perl\CGI2Perl.NLM
 PERL2UCS_NLM = $(AUTODIR)\Perl2UCS\Perl2UCS.NLM
@@ -331,12 +369,11 @@ UCSExt_NLM = $(AUTODIR)\UCSExt\UCSExt.NLM
 
 NETWARE_EXTNS =	\
 		$(CGI2PERL_NLM) \
-		$(UCSExt_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)
@@ -371,9 +408,13 @@ BUILT     = $(BLDDIR)\$(NLM_NAME8).$(NLM_EXT)
 
 !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, @$(SECURITY_IMPORTS)\nwsec.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
@@ -381,18 +422,26 @@ BASE_IMPORT_FILES = $(BASE_IMPORT_FILES), @$(MPKBASE)\import\mpkorg.imp
 !ifndef BASE_IMPORT_FNS
 BASE_IMPORT_FNS = Import ImportSymbol, GetSystemConsoleScreen, LoadModule
 !endif
-																
-																
+
+!ifdef CODEWAR
+NWLIBPATH  = 
+LIBPATH386 = 
+LIBPATH = 
+!else											# !ifdef CODEWAR
+!error Please define the tools base directory before proceeding
+!endif											# !ifdef CODEWAR
+
 !ifndef BASE_LIBRARIES
-#!ifdef WATCOM
-#BASE_LIBRARIES = Library plib3s.lib,math3s.lib,clib3s.lib
-#!else
+!ifdef WATCOM
+BASE_LIBRARIES = Library plib3s.lib, math3s.lib, clib3s.lib
+!endif											# !ifdef WATCOM
 !ifdef CODEWAR
 BASE_LIBRARIES = 
-!endif																#!ifdef CODEWARRIOR
-!endif																
-																
-COPYRIGHT = (C) Copyright 2002 Novell Inc. All Rights Reserved.
+!endif											# !ifdef CODEWAR
+!endif											# !ifndef BASE_LIBRARIES
+
+
+COPYRIGHT = Copyright (C) 2000-01, 2002 Novell, Inc. All Rights Reserved.
 
 EXPORTS = Export @perl.imp
 
@@ -418,7 +467,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.9.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -667,8 +716,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		\
@@ -769,7 +817,7 @@ 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 \
+		Storable/Storable List/Util MIME/Base64/Base64 XS/APItest/APItest \
 		XS/Typemap/Typemap Unicode/Normalize/Normalize Sys/Hostname
 
 STATIC_EXT	= DynaLoader
@@ -797,6 +845,7 @@ CWD			= $(EXTDIR)\Cwd\Cwd
 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
 
@@ -823,6 +872,7 @@ EXTENSION_C	= 		\
 		$(STORABLE).c	\
 		$(LISTUTIL).c	\
 		$(MIMEBASE64).c	\
+		$(XSAPITEST).c	\
 		$(XSTYPEMAP).c	\
 		$(UNICODENORMALIZE).c	\
 
@@ -838,7 +888,7 @@ POD2TEXT	= $(PODDIR)\pod2text
 # Top targets
 #
 
-all : .cleanoldfiles .\nwconfig.h $(CONFIGPM) $(NLM_NAME) $(EXTENSION_NPM) $(NETWARE_EXTNS) $(TEST_NLMS) $(EXTENSION_NLM) 
+all : .cleanoldfiles .\nwconfig.h $(CONFIGPM) $(NLM_NAME) $(EXTENSION_NLM) $(EXTENSION_NPM) $(TEST_NLMS) $(NETWARE_EXTNS)
 
 #------------------------------------------------------------
 
@@ -868,6 +918,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
@@ -879,7 +930,7 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl
 	@echo $(MPKMESSAGE)...$(BLDMESG)...$@
 	$(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) $(COMPLER_FLAGS) $(NLM_INCLUDES) -I..\x2p $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@
@@ -924,7 +975,7 @@ HEADERS :
 	@copy << stdio.h >\nul
 
 /*
- * (C) Copyright 2002 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.
@@ -961,7 +1012,7 @@ HEADERS :
 	@copy << string.h >\nul
 
 /*
- * (C) Copyright 2002 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.
@@ -1003,7 +1054,9 @@ $(NLM_NAME): MESSAGE HEADERS $(BLDDIR)\nul $(NLM_OBJ) $(NEWTARE_OBJ_DEP) $(NEWTA
 	@echo $(BASE_IMPORT_FILES) > $*.def
 	@echo MODULE clib >> $*.def
 	@echo MODULE netdb >> $*.def
-#   @echo MODULE nwsec >> $*.def
+!ifdef SECURITYBASE
+   @echo MODULE nwsec >> $*.def
+!endif											#!ifdef SECURITYBASE
 	@echo $(EXPORTS) >> $*.def
 !ifdef USE_XDC
 	@echo======= Creating XDC file
@@ -1021,13 +1074,7 @@ $(NLM_NAME): MESSAGE HEADERS $(BLDDIR)\nul $(NLM_OBJ) $(NEWTARE_OBJ_DEP) $(NEWTA
 	copy splittree.pl .. 
 	$(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
 	@echo ========Linked $@ ==========
-##!if "$(MAKE_TYPE)"=="Debug"
-##!ifdef NLM_NAME8
-## 	.\bat\cvpack $(BLDDIR)\$(NLM_NAME8).sym
-##!else
-## 	.\bat\cvpack $(BLDDIR)\$(NLM_NAME).sym
-##!endif
-##!endif
+
 	@echo======= Finished building $(BUILT).
 
 # Create the debug or release directory if not existing
@@ -1040,6 +1087,11 @@ MESSAGE:
 	@echo======= $(MAKE_ACTION)ing $(NLM_NAME) at $(MAKEDIR)\$(BLDDIR) ======= 
   
 $(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) ..\global.sym ..\pp.sym ..\makedef.pl
 #	$(MINIPERL) -w ..\makedef.pl PLATFORM=netware FILETYPE=def $(ADD_BUILDOPT) \
@@ -1110,7 +1162,7 @@ $(EXT_MAIN_OBJ) : $(CLIB_H_FILES)
 	-del /f /q ..\lib\core
 
 .\nwconfig.h : $(NW_CFGH_TMPL)
-	-del /f /q 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
@@ -1245,6 +1297,12 @@ $(MIMEBASE64_NLM):
 	$(MAKE)
 	cd ..\..\..\netware
 
+$(XSAPITEST_NLM):
+	cd $(EXTDIR)\XS\$(*B)
+	..\..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
+	$(MAKE)
+	cd ..\..\..\netware
+
 $(XSTYPEMAP_NLM):
 	cd $(EXTDIR)\XS\$(*B)
 	..\..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
@@ -1317,7 +1375,7 @@ $(CGI2PERL_NLM):
 
 $(PERL2UCS_NLM):
 !if "$(NW_EXTNS)"=="yes"
-	cd $(EXTDIR)\$(*B)
+	cd $(*B)
 	..\..\miniperl -I..\..\lib Makefile.PL "CCCDLFLAGS=-bool on -lang c++" PERL_CORE=1 INSTALLDIRS=perl
 	$(MAKE)
 	cd ..\..\netware
@@ -1325,7 +1383,7 @@ $(PERL2UCS_NLM):
 
 $(UCSExt_NLM):
 !if "$(NW_EXTNS)"=="yes"
-	cd $(EXTDIR)\$(*B)
+	cd $(*B)
 	..\..\miniperl -I..\..\lib Makefile.PL "CCCDLFLAGS=-bool on -lang c++" PERL_CORE=1 INSTALLDIRS=perl
 	$(MAKE)
 	cd ..\..\netware
@@ -1336,14 +1394,14 @@ nwclean:
 	-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 .\Main.obj del /f /q .\Main.obj
-	@if exist .\Main.lib del /f /q .\Main.lib
+	@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 /f /q *.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 /f /q *.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)
@@ -1360,15 +1418,20 @@ utils: $(BLDDIR)\$(NLM_NAME8).$(NLM_EXT) $(X2P)
 	copy ..\README.win32 .\perlwin32.pod
 	copy ..\README.netware .\perlnw5.pod
 	$(MAKE) -f ..\win32\pod.mak converters
+
+	cd ..\lib
+	$(MINIPERL) lib_pm.PL
 	cd ..\netware
 	$(MINIPERL) $(PL2BAT) $(UTILS)
 
 distclean: clean nwclean
 	-del /f /q $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
-	-del /f /q *.def *.map
 	-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)\attrs.pm $(LIBDIR)\DynaLoader.pm
 	-del /f /q $(LIBDIR)\XSLoader.pm
 	-del /f /q $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
@@ -1391,23 +1454,23 @@ distclean: clean nwclean
 	cd ..\netware
 	cd ..\x2p
 	-del /f /q find2perl s2p
-	-del /f /q *.bat
+	-del /f /q *.bat *.exe
 	-del /f /q *.obj *.map *.link *.xdc *.err
 	cd ..\netware
 	-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 /f /q *.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 /f /q *.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 /f /q *.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 $(EXTDIR)\UCSExt
+	cd UCSExt
 	-del /f /q *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map *.c
 	cd ..\..\netware
 !endif
@@ -1418,7 +1481,10 @@ distclean: clean nwclean
 installwin:
 	$(MINIPERL) -I..\lib ..\installperl
 
-install : utils installwin
+install : utils installwin perlimp
+
+perlimp :
+	copy perl.imp $(INST_COREDIR)
 
 installnw:
 	$(MINIPERL) -I..\lib ..\installperl -netware