[PATCH] Move Win32.pm/Win32.xs from libwin32 module to core Perl

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 711fbd6..65f0fa5 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -679,6 +679,7 @@ PERLIOVIA           = $(EXTDIR)\PerlIO\via\via
 XSAPITEST              = $(EXTDIR)\XS\APItest\APItest
 XSTYPEMAP              = $(EXTDIR)\XS\Typemap\Typemap
 UNICODENORMALIZE       = $(EXTDIR)\Unicode\Normalize\Normalize
+WIN32_DIR              = ext\Win32
 
 SOCKET_DLL             = $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL              = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -709,6 +710,7 @@ PERLIOVIA_DLL               = $(AUTODIR)\PerlIO\via\via.dll
 XSAPITEST_DLL          = $(AUTODIR)\XS\APItest\APItest.dll
 XSTYPEMAP_DLL          = $(AUTODIR)\XS\Typemap\Typemap.dll
 UNICODENORMALIZE_DLL   = $(AUTODIR)\Unicode\Normalize\Normalize.dll
+WIN32_DLL              = $(AUTODIR)\Win32\Win32.dll
 
 EXTENSION_C    =               \
                $(SOCKET).c     \
@@ -739,7 +741,8 @@ EXTENSION_C =               \
                $(PERLIOVIA).c  \
                $(XSAPITEST).c  \
                $(XSTYPEMAP).c  \
-               $(UNICODENORMALIZE).c
+               $(UNICODENORMALIZE).c   \
+               $(WIN32_DIR).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -770,7 +773,8 @@ EXTENSION_DLL       =               \
                $(PERLIOVIA_DLL)        \
                $(XSAPITEST_DLL)        \
                $(XSTYPEMAP_DLL)        \
-               $(UNICODENORMALIZE_DLL)
+               $(UNICODENORMALIZE_DLL) \
+               $(WIN32_DLL)
 
 POD2HTML       = $(PODDIR)\pod2html
 POD2MAN                = $(PODDIR)\pod2man
@@ -961,16 +965,19 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 #----------------------------------------------------------------------------------
 Extensions: buildext.pl $(PERLDEP) $(CONFIGPM)
        $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR)
+       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext
 
 # Note: The next two targets explicitly remove a "blibdirs.exists" file that
 # currerntly gets left behind, until CPAN RT Ticket #5616 is resolved.
 
 Extensions_clean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
+       -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext clean
        -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists
 
 Extensions_realclean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean
+       -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext realclean
        -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists
 
 #----------------------------------------------------------------------------------
@@ -1067,6 +1074,7 @@ distclean: realclean
        -del /f $(LIBDIR)\threads\shared.pm
        -del /f $(LIBDIR)\Time\HiRes.pm
        -del /f $(LIBDIR)\Unicode\Normalize.pm
+       -del /f $(LIBDIR)\Win32.pm
        -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
        -if exist $(LIBDIR)\IO rmdir /s $(LIBDIR)\IO
        -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B