skip_all_without_dynamic_extension() should accepted names containing ::s

[perl5.git] / NetWare / Makefile

diff --git a/NetWare/Makefile b/NetWare/Makefile
index febde01..4790c44 100644 (file)
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -86,7 +86,7 @@ NLM_VERSION    = 3,20,0
 
 
 # Here comes the CW tools - TO BE FILLED TO BUILD WITH CW -
-MODULE_DESC     = "Perl 5.13.4 for NetWare"
+MODULE_DESC     = "Perl 5.13.10 for NetWare"
 CCTYPE          = CodeWarrior
 C_COMPILER             = mwccnlm -c
 CPP_COMPILER   = mwccnlm
@@ -326,9 +326,9 @@ 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
-XSAPITESTKEYWORDRPN_NLM        = $(EXTDIR)\XS\APItest\KeywordRPN\KeywordRPN.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)    \
@@ -351,7 +351,6 @@ EXTENSION_NLM       =               \
                $(LISTUTIL_NLM)         \
                $(MIMEBASE64_NLM)       \
                $(XSAPITEST_NLM)        \
-               $(XSAPITESTKEYWORDRPN_NLM)      \
                $(XSTYPEMAP_NLM)        \
                $(UNICODENORMALIZE_NLM)  \
                $(FILTER_NLM)   
@@ -465,7 +464,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.13.4
+INST_VER       = \5.13.10
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -702,6 +701,7 @@ MICROCORE_SRC       =               \
                ..\gv.c         \
                ..\mro.c        \
                ..\hv.c         \
+               ..\keywords.c   \
                ..\locale.c     \
                 ..\mathoms.c    \
                ..\mg.c         \
@@ -791,8 +791,8 @@ X2P_OBJ             = $(X2P_SRC:.c=.obj)
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attributes B re \
                Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
-               Storable/Storable List/Util MIME/Base64/Base64 XS/APItest/APItest XS/APItest/KeywordRPN \
-               XS/Typemap/Typemap Unicode/Normalize/Normalize Sys/Hostname
+               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
@@ -819,9 +819,9 @@ STORABLE            = $(EXTDIR)\Storable\Storable
 LISTUTIL               = $(EXTDIR)\List\Util
 MIMEBASE64             = $(EXTDIR)\MIME\Base64\Base64
 XSAPITEST              = $(EXTDIR)\XS\APItest\APItest
-XSAPITESTKEYWORDRPN    = $(EXTDIR)\XS\APItest\KeywordRPN\KeywordRPN
 XSTYPEMAP              = $(EXTDIR)\XS\Typemap\Typemap
 UNICODENORMALIZE       = $(EXTDIR)\Unicode\Normalize\Normalize
+UNICODECOLLATE = $(EXTDIR)\Unicode\Collate\Collate
 
 ERRNO_PM_NW    = $(LIBDIR)\Errno.pm
 
@@ -846,7 +846,6 @@ EXTENSION_C =               \
                $(LISTUTIL).c   \
                $(MIMEBASE64).c \
                $(XSAPITEST).c  \
-               $(XSAPITESTKEYWORDRPN).c        \
                $(XSTYPEMAP).c  \
                $(UNICODENORMALIZE).c   \
 
@@ -1067,7 +1066,7 @@ $(PERLIMPLIB): perllib.imp
 #      $(XCOPY) $(PERLIMPLIB) $(COREDIR)
 #      @echo $(PERLIMPLIB) Done
 
-perllib.imp : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl
+perllib.imp : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\makedef.pl
 #      $(MINIPERL) -w ..\makedef.pl PLATFORM=netware FILETYPE=def $(ADD_BUILDOPT) \
 #          CCTYPE=$(CCTYPE) > perllib.def
        @echo (Perl) > perl.imp
@@ -1271,12 +1270,6 @@ $(XSAPITEST_NLM):
        $(MAKE)
        cd ..\..\..\netware
 
-$(XSAPITESTKEYWORDRPN_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
@@ -1413,6 +1406,7 @@ distclean: clean nwclean
        -del /f /q $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.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