From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sun, 25 Mar 2001 04:12:43 +0000 (+0000)
Subject: Add PerlIO::Scalar to win32/Makefile. (I'm doing
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7975e2ef3c4db4170a15045c4786caa6d631d6a4;p=p5sagit%2Fp5-mst-13.2.git

Add PerlIO::Scalar to win32/Makefile. (I'm doing
this by ear as I do not do Win32 programming.)

p4raw-id: //depot/perl@9336
---

diff --git a/win32/Makefile b/win32/Makefile
index 295afc4..89cd0d9 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -608,7 +608,8 @@ 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/Call Encode Digest/MD5
+		Sys/Hostname Storable Filter/Util/Call Encode Digest/MD5 \
+		PerlIO/Scalar
 STATIC_EXT	= DynaLoader
 NONXS_EXT	= Errno
 
@@ -634,6 +635,7 @@ STORABLE	= $(EXTDIR)\Storable\Storable
 FILTER		= $(EXTDIR)\Filter\Util\Call\Call
 ENCODE		= $(EXTDIR)\Encode\Encode
 MD5		= $(EXTDIR)\Digest\MD5\MD5
+PERLIOSCALAR	= $(EXTDIR)\PerlIO\Scalar\Scalar
 
 SOCKET_DLL	= $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL	= $(AUTODIR)\Fcntl\Fcntl.dll
@@ -655,6 +657,7 @@ STORABLE_DLL	= $(AUTODIR)\Storable\Storable.dll
 FILTER_DLL	= $(AUTODIR)\Filter\Util\Call\Call.dll
 ENCODE_DLL	= $(AUTODIR)\Encode\Encode.dll
 MD5_DLL		= $(AUTODIR)\Digest\MD5\MD5.dll
+PERLIOSCALAR_DLL= $(AUTODIR)\PerlIO\Scalar\Scalar.dll
 
 ERRNO_PM	= $(LIBDIR)\Errno.pm
 
@@ -678,7 +681,8 @@ EXTENSION_C	= 		\
 		$(STORABLE).c	\
 		$(FILTER).c	\
 		$(ENCODE).c	\
-		$(MD5).c	
+		$(MD5).c	\
+		$(PERLIOSCALAR).c	
 
 EXTENSION_DLL	= 		\
 		$(SOCKET_DLL)	\
@@ -700,7 +704,8 @@ EXTENSION_DLL	= 		\
 		$(STORABLE_DLL)	\
 		$(FILTER_DLL)   \
 		$(ENCODE_DLL)   \
-		$(MD5_DLL)
+		$(MD5_DLL)	\
+		$(PERLIOSCALAR_DLL)
 
 EXTENSION_PM	=		\
 		$(ERRNO_PM)
@@ -1008,6 +1013,12 @@ $(MD5_DLL): $(PERLEXE) $(MD5).xs
 	$(MAKE)
 	cd ..\..\win32
 
+$(PERLIOSCALAR_DLL): $(PERLEXE) $(PERLIOSCALAR).xs
+	cd $(EXTDIR)\$(*B)
+	..\..\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
@@ -1063,6 +1074,7 @@ distclean: clean
 	-del /f $(LIBDIR)\Storable.pm
 	-del /f $(LIBDIR)\Filter\Util\Call\Call.pm
 	-del /f $(LIBDIR)\Digest\MD5.pm
+	-del /f $(LIBDIR)\PerlIO\Scalar\Scalar.pm
 	-if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
 	-rmdir /s $(LIBDIR)\IO
 	-if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 24df13d..08854db 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -807,7 +807,7 @@ EXTENSION_C	=		\
 		$(THREAD).c	\
 		$(RE).c		\
 		$(DUMPER).c	\
-		$(SCALARR).c	\
+		$(SCALAR).c	\
 		$(PEEK).c	\
 		$(B).c		\
 		$(BYTELOADER).c	\