build the Filter extension on windows

p4raw-id: //depot/perl@7829

diff --git a/win32/Makefile b/win32/Makefile
index c79c75b..3315905 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -614,7 +614,7 @@ SETARGV_OBJ = setargv$(o)
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
                Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
-               Sys/Hostname Storable
+               Sys/Hostname Storable Filter/Util
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -637,6 +637,7 @@ DPROF               = $(EXTDIR)\Devel\DProf\DProf
 GLOB           = $(EXTDIR)\File\Glob\Glob
 HOSTNAME       = $(EXTDIR)\Sys\Hostname\Hostname
 STORABLE       = $(EXTDIR)\Storable\Storable
+FILTER         = $(EXTDIR)\Filter\Util\Call
 
 SOCKET_DLL     = $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL      = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -655,6 +656,7 @@ DPROF_DLL   = $(AUTODIR)\Devel\DProf\DProf.dll
 GLOB_DLL       = $(AUTODIR)\File\Glob\Glob.dll
 HOSTNAME_DLL   = $(AUTODIR)\Sys\Hostname\Hostname.dll
 STORABLE_DLL   = $(AUTODIR)\Storable\Storable.dll
+FILTER_DLL     = $(EXTDIR)\Filter\Util\Call.dll
 
 ERRNO_PM       = $(LIBDIR)\Errno.pm
 
@@ -675,7 +677,8 @@ EXTENSION_C =               \
                $(DPROF).c      \
                $(GLOB).c       \
                $(HOSTNAME).c   \
-               $(STORABLE).c
+               $(STORABLE).c   \
+               $(FILTER).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -694,7 +697,8 @@ EXTENSION_DLL       =               \
                $(DPROF_DLL)    \
                $(GLOB_DLL)     \
                $(HOSTNAME_DLL) \
-               $(STORABLE_DLL)
+               $(STORABLE_DLL) \
+               $(FILTER_DLL)
 
 EXTENSION_PM   =               \
                $(ERRNO_PM)
@@ -983,6 +987,12 @@ $(STORABLE_DLL): $(PERLEXE) $(STORABLE).xs
        $(MAKE)
        cd ..\..\win32
 
+$(FILTER_DLL): $(PERLEXE) $(FILTER).xs
+       cd $(EXTDIR)\Filter\Util
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\..\win32
+
 $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
        cd $(EXTDIR)\$(*B)
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -1029,6 +1039,7 @@ distclean: clean
        -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm
        -del /f $(LIBDIR)\File\Glob.pm
        -del /f $(LIBDIR)\Storable.pm
+       -del /f $(LIBDIR)\Filter\Util\Call.pm
        -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO 
        -rmdir /s $(LIBDIR)\IO
        -if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread 
@@ -1037,6 +1048,8 @@ distclean: clean
        -rmdir /s $(LIBDIR)\B
        -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data 
        -rmdir /s $(LIBDIR)\Data
+       -if exist $(LIBDIR)\Filter rmdir /s /q $(LIBDIR)\Filter
+       -rmdir /s $(LIBDIR)\Filter
        -del /f $(PODDIR)\*.html
        -del /f $(PODDIR)\*.bat
        cd ..\utils

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 50fbdd4..a494ff9 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -715,7 +715,7 @@ SETARGV_OBJ = setargv$(o)
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
                Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
-               Sys/Hostname Storable
+               Sys/Hostname Storable Filter/Util
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -738,6 +738,7 @@ DPROF               = $(EXTDIR)\Devel\DProf\DProf
 GLOB           = $(EXTDIR)\File\Glob\Glob
 HOSTNAME       = $(EXTDIR)\Sys\Hostname\Hostname
 STORABLE       = $(EXTDIR)\Storable\Storable
+FILTER         = $(EXTDIR)\Filter\Util\Call
 
 SOCKET_DLL     = $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL      = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -756,6 +757,7 @@ DPROF_DLL   = $(AUTODIR)\Devel\DProf\DProf.dll
 GLOB_DLL       = $(AUTODIR)\File\Glob\Glob.dll
 HOSTNAME_DLL   = $(AUTODIR)\Sys\Hostname\Hostname.dll
 STORABLE_DLL   = $(AUTODIR)\Storable\Storable.dll
+FILTER_DLL     = $(EXTDIR)\Filter\Util\Call.dll
 
 ERRNO_PM       = $(LIBDIR)\Errno.pm
 
@@ -776,7 +778,8 @@ EXTENSION_C =               \
                $(DPROF).c      \
                $(GLOB).c       \
                $(HOSTNAME).c   \
-               $(STORABLE).c
+               $(STORABLE).c   \
+               $(FILTER).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -795,7 +798,8 @@ EXTENSION_DLL       =               \
                $(DPROF_DLL)    \
                $(GLOB_DLL)     \
                $(HOSTNAME_DLL) \
-               $(STORABLE_DLL)
+               $(STORABLE_DLL) \
+               $(FILTER_DLL)
 
 EXTENSION_PM   =               \
                $(ERRNO_PM)
@@ -1183,6 +1187,11 @@ $(STORABLE_DLL): $(PERLEXE) $(STORABLE).xs
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
        cd $(EXTDIR)\$(*B) && $(MAKE)
 
+$(FILTER_DLL): $(PERLEXE) $(FILTER).xs
+       cd $(EXTDIR)\Filter\Util && \
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       cd $(EXTDIR)\Filter\Util && $(MAKE)
+
 $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
        cd $(EXTDIR)\$(*B) && \
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -1224,10 +1233,12 @@ distclean: clean
        -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm
        -del /f $(LIBDIR)\File\Glob.pm
        -del /f $(LIBDIR)\Storable.pm
+       -del /f $(LIBDIR)\Filter\Util\Call.pm
        -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO
        -if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread
        -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B
        -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data || rmdir /s $(LIBDIR)\Data
+       -if exist $(LIBDIR)\Filter rmdir /s /q $(LIBDIR)\Filter || rmdir /s $(LIBDIR)\Filter
        -del /f $(PODDIR)\*.html
        -del /f $(PODDIR)\*.bat
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc \