summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2000-11-23 16:54:14 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2000-11-23 16:54:14 +0000
commit5e506771ef964d2ede7c5844ad7d02ba0cf9d549 (patch)
tree0f7f6c3dbf49f65725cabc3ff4104c60fc34490b /win32
parentdfc18e8ad09e7e2177a68bca5100ec871c744055 (diff)
downloadperl-5e506771ef964d2ede7c5844ad7d02ba0cf9d549.tar.gz
Push Filter::Util::Call one level deeper.
p4raw-id: //depot/perl@7839
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile14
-rw-r--r--win32/makefile.mk13
2 files changed, 14 insertions, 13 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 3315905747..ae9f6c90a4 100644
--- 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 Filter/Util
+ Sys/Hostname Storable Filter/Util/Call
STATIC_EXT = DynaLoader
NONXS_EXT = Errno
@@ -637,7 +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
+FILTER = $(EXTDIR)\Filter\Util\Call\Call
SOCKET_DLL = $(AUTODIR)\Socket\Socket.dll
FCNTL_DLL = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -656,7 +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
+FILTER_DLL = $(EXTDIR)\Filter\Util\Call\Call.dll
ERRNO_PM = $(LIBDIR)\Errno.pm
@@ -988,7 +988,7 @@ $(STORABLE_DLL): $(PERLEXE) $(STORABLE).xs
cd ..\..\win32
$(FILTER_DLL): $(PERLEXE) $(FILTER).xs
- cd $(EXTDIR)\Filter\Util
+ cd $(EXTDIR)\Filter\Util\Call
..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
$(MAKE)
cd ..\..\..\win32
@@ -1039,7 +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
+ -del /f $(LIBDIR)\Filter\Util\Call\Call.pm
-if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
-rmdir /s $(LIBDIR)\IO
-if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread
@@ -1048,8 +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
+ -if exist $(LIBDIR)\Filter\Util\Call rmdir /s /q $(LIBDIR)\Filter\Util\Call
+ -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util
-del /f $(PODDIR)\*.html
-del /f $(PODDIR)\*.bat
cd ..\utils
diff --git a/win32/makefile.mk b/win32/makefile.mk
index dcf10fed3c..4677c809ed 100644
--- 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 Filter/Util Encode
+ Sys/Hostname Storable Filter/Util/Call Encode
STATIC_EXT = DynaLoader
NONXS_EXT = Errno
@@ -738,7 +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
+FILTER = $(EXTDIR)\Filter\Util\Call\Call
ENCODE = $(EXTDIR)\Encode\Encode
SOCKET_DLL = $(AUTODIR)\Socket\Socket.dll
@@ -1197,9 +1197,9 @@ $(STORABLE_DLL): $(PERLEXE) $(STORABLE).xs
cd $(EXTDIR)\$(*B) && $(MAKE)
$(FILTER_DLL): $(PERLEXE) $(FILTER).xs
- cd $(EXTDIR)\Filter\Util && \
+ cd $(EXTDIR)\Filter\Util\Call && \
..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
- cd $(EXTDIR)\Filter\Util && $(MAKE)
+ cd $(EXTDIR)\Filter\Util\Call && $(MAKE)
$(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
cd $(EXTDIR)\$(*B) && \
@@ -1242,12 +1242,13 @@ 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
+ -del /f $(LIBDIR)\Filter\Util\Call\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
+ -if exist $(LIBDIR)\Filter\Util\Call rmdir /s /q $(LIBDIR)\Filter\Util\Call || rmdir /s $(LIBDIR)\Filter
+ -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util || rmdir /s $(LIBDIR)\Filter
-del /f $(PODDIR)\*.html
-del /f $(PODDIR)\*.bat
-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc \