Remove ext/Thread
[p5sagit/p5-mst-13.2.git] / NetWare / Makefile
index bb40515..9e7515f 100644 (file)
@@ -33,7 +33,6 @@ REL_DIR       = Release
 DEB_DIR = Debug
 
 
-!ifndef MAKE_TYPE
 !ifndef NLMSDKBASE
 !message "Run bat\SetNWBld.bat to set the NetWare SDK before continuing.\n"
 !error
@@ -87,7 +86,7 @@ NLM_VERSION    = 3,20,0
 
 
 # Here comes the CW tools - TO BE FILLED TO BUILD WITH CW -
-MODULE_DESC     = "Perl 5.8.0 for NetWare"
+MODULE_DESC     = "Perl 5.9.5 for NetWare"
 CCTYPE          = CodeWarrior
 C_COMPILER             = mwccnlm -c
 CPP_COMPILER   = mwccnlm
@@ -115,17 +114,17 @@ BLDMESG       = Debug version,
 BS_CFLAGS      = -opt off -inline off -sym on -sym codeview4 -sym internal -DDEBUGGING -DDKFBPON
 BLDMESG                = $(BLDMESG) Using /d2 option
 !ifdef NLM_NAME8
-LDFLAGS                = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(NLM_NAME8).sym
+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 $(NLM_NAME).sym
+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
 !ifdef NLM_NAME8
-LDFLAGS                = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(NLM_NAME8).sym
+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 $(NLM_NAME).sym
+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"
@@ -286,9 +285,7 @@ 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=$(LINK)"                    \
                "base_import=$(BASE_IMPORT_FILES)"      \
@@ -316,7 +313,6 @@ OPCODE_NLM  = $(AUTODIR)\Opcode\Opcode.NLM
 SDBM_FILE_NLM = $(AUTODIR)\SDBM_File\SDBM_File.NLM
 POSIX_NLM      = $(AUTODIR)\POSIX\POSIX.NLM
 ATTRS_NLM      = $(AUTODIR)\attrs\attrs.NLM
-THREAD_NLM     = $(AUTODIR)\Thread\Thread.NLM
 B_NLM          = $(AUTODIR)\B\B.NLM
 DUMPER_NLM     = $(AUTODIR)\Data\Dumper\Dumper.NLM
 PEEK_NLM       = $(AUTODIR)\Devel\Peek\Peek.NLM
@@ -329,6 +325,7 @@ 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
 
@@ -342,7 +339,6 @@ EXTENSION_NLM       =               \
                $(ATTRS_NLM)    \
                $(SDBM_FILE_NLM)        \
                $(POSIX_NLM)    \
-               $(THREAD_NLM)   \
                $(DUMPER_NLM)   \
                $(GLOB_NLM)             \
                $(PEEK_NLM)             \
@@ -353,14 +349,15 @@ EXTENSION_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               = $(EXTDIR)\Perl2UCS\Perl2UCS
-UCSExt                 = $(EXTDIR)\Perl2UCS\UCSExt
+PERL2UCS               = Perl2UCS\Perl2UCS
+UCSExt                 = Perl2UCS\UCSExt
 
 CGI2PERL_NLM = \CGI2Perl\CGI2Perl.NLM
 PERL2UCS_NLM = $(AUTODIR)\Perl2UCS\Perl2UCS.NLM
@@ -466,7 +463,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.8.0
+INST_VER       = \5.9.5
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -504,15 +501,6 @@ USE_IMP_SYS        = define
 # else USE_STDIO will be defined.
 #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
 #
@@ -554,14 +542,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
@@ -582,16 +562,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
 
@@ -603,17 +582,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
 
@@ -692,7 +667,6 @@ UTILS               =                       \
                ..\utils\c2ph           \
                ..\utils\h2xs           \
                ..\utils\perldoc        \
-               ..\utils\perlcc         \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
@@ -725,8 +699,10 @@ MICROCORE_SRC      =               \
                ..\dump.c       \
                ..\globals.c    \
                ..\gv.c         \
+               ..\mro.c        \
                ..\hv.c         \
                ..\locale.c     \
+                ..\mathoms.c    \
                ..\mg.c         \
                ..\numeric.c    \
                ..\op.c         \
@@ -814,9 +790,9 @@ 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 \
+DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs 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
@@ -830,7 +806,6 @@ SDBM_FILE   = $(EXTDIR)\SDBM_File\SDBM_File
 IO                     = $(EXTDIR)\IO\IO
 POSIX          = $(EXTDIR)\POSIX\POSIX
 ATTRS          = $(EXTDIR)\attrs\attrs
-THREAD         = $(EXTDIR)\Thread\Thread
 B                      = $(EXTDIR)\B\B
 RE                     = $(EXTDIR)\re\re
 DUMPER         = $(EXTDIR)\Data\Dumper\Dumper
@@ -844,6 +819,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
 
@@ -857,7 +833,6 @@ EXTENSION_C =               \
                $(IO).c         \
                $(POSIX).c      \
                $(ATTRS).c      \
-               $(THREAD).c     \
                $(RE).c         \
                $(DUMPER).c     \
                $(PEEK).c       \
@@ -870,6 +845,7 @@ EXTENSION_C =               \
                $(STORABLE).c   \
                $(LISTUTIL).c   \
                $(MIMEBASE64).c \
+               $(XSAPITEST).c  \
                $(XSTYPEMAP).c  \
                $(UNICODENORMALIZE).c   \
 
@@ -927,7 +903,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 $@
@@ -1072,14 +1048,6 @@ $(NLM_NAME): MESSAGE HEADERS $(BLDDIR)\nul $(NLM_OBJ) $(NEWTARE_OBJ_DEP) $(NEWTA
        $(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
@@ -1260,12 +1228,6 @@ $(POSIX_NLM):
        $(MAKE)
        cd ..\..\netware
 
-$(THREAD_NLM):
-       cd $(EXTDIR)\$(*B)
-       ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
-       $(MAKE)
-       cd ..\..\netware
-
 $(ATTRS_NLM):
        cd $(EXTDIR)\$(*B)
        ..\..\miniperl -I..\..\lib Makefile.PL PERL_CORE=1 INSTALLDIRS=perl
@@ -1302,6 +1264,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
@@ -1374,7 +1342,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
@@ -1382,7 +1350,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
@@ -1396,11 +1364,11 @@ nwclean:
        @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
+       -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)
@@ -1417,6 +1385,9 @@ 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)
 
@@ -1439,7 +1410,6 @@ distclean: clean nwclean
        -del /f /q $(LIBDIR)\File\Glob.pm
        -del /f /q $(LIBDIR)\Unicode\Normalize.pm
        -rmdir /s /q $(LIBDIR)\IO
-       -rmdir /s /q $(LIBDIR)\Thread
        -rmdir /s /q $(LIBDIR)\B
        -rmdir /s /q $(LIBDIR)\Data
        -del /f /q $(PODDIR)\*.html
@@ -1457,16 +1427,16 @@ distclean: clean nwclean
        -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