From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Thu, 23 Nov 2000 10:31:07 +0000 (+0000)
Subject: Correct makefile.mk dependancies for ext/Filter/Util
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d9b8e8ae7b58c451dc0a91c12573efba809584ca;p=p5sagit%2Fp5-mst-13.2.git

Correct makefile.mk dependancies for ext/Filter/Util
Build ext/Encode
Run dmake regen_config_h

p4raw-id: //depot/perlio@7831
---

diff --git a/win32/config_H.bc b/win32/config_H.bc
index 87678ca..7a4c4d0 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -13,8 +13,8 @@
 /*
  * Package name      : perl5
  * Source directory  : 
- * Configuration time: Wed Nov 22 18:22:25 2000
- * Configured by     : gsar
+ * Configuration time: Thu Nov 23 10:24:23 2000
+ * Configured by     : nick
  * Target system     : 
  */
 
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 745cc38..6d90b9f 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -13,8 +13,8 @@
 /*
  * Package name      : perl5
  * Source directory  : 
- * Configuration time: Wed Nov 22 18:22:31 2000
- * Configured by     : gsar
+ * Configuration time: Thu Nov 23 10:22:12 2000
+ * Configured by     : nick
  * Target system     : 
  */
 
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 1f7d322..43e4745 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -13,8 +13,8 @@
 /*
  * Package name      : perl5
  * Source directory  : 
- * Configuration time: Wed Nov 22 18:22:35 2000
- * Configured by     : gsar
+ * Configuration time: Thu Nov 23 10:24:50 2000
+ * Configured by     : nick
  * Target system     : 
  */
 
diff --git a/win32/makefile.mk b/win32/makefile.mk
index a494ff9..dcf10fe 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -111,7 +111,7 @@ CCTYPE		*= GCC
 # If not enabled, we automatically try to use maximum optimization
 # with all compilers that are known to have a working optimizer.
 #
-#CFG		*= Debug
+CFG		*= Debug
 
 #
 # uncomment to enable use of PerlCRT.DLL when using the Visual C compiler.
@@ -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
+		Sys/Hostname Storable Filter/Util Encode
 STATIC_EXT	= DynaLoader
 NONXS_EXT	= Errno
 
@@ -739,6 +739,7 @@ GLOB		= $(EXTDIR)\File\Glob\Glob
 HOSTNAME	= $(EXTDIR)\Sys\Hostname\Hostname
 STORABLE	= $(EXTDIR)\Storable\Storable
 FILTER		= $(EXTDIR)\Filter\Util\Call
+ENCODE          = $(EXTDIR)\Encode\Encode   
 
 SOCKET_DLL	= $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL	= $(AUTODIR)\Fcntl\Fcntl.dll
@@ -757,7 +758,8 @@ 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	= $(AUTODIR)\Filter\Util\Call\Call.dll
+ENCODE_DLL	= $(AUTODIR)\Encode\Encode.dll
 
 ERRNO_PM	= $(LIBDIR)\Errno.pm
 
@@ -779,7 +781,8 @@ EXTENSION_C	=		\
 		$(GLOB).c	\
 		$(HOSTNAME).c	\
 		$(STORABLE).c	\
-		$(FILTER).c
+		$(FILTER).c     \
+		$(ENCODE).c
 
 EXTENSION_DLL	=		\
 		$(SOCKET_DLL)	\
@@ -799,7 +802,8 @@ EXTENSION_DLL	=		\
 		$(GLOB_DLL)	\
 		$(HOSTNAME_DLL)	\
 		$(STORABLE_DLL)	\
-		$(FILTER_DLL)
+		$(FILTER_DLL)   \
+		$(ENCODE_DLL)
 
 EXTENSION_PM	=		\
 		$(ERRNO_PM)
@@ -853,7 +857,7 @@ RIGHTMAKE	= __switch_makefiles
 NOOP		= @rem
 .ELSE
 MK2		= __not_needed
-RIGHTMAKE	= __not_needed
+RIGHTMAKE	= 
 .ENDIF
 
 #
@@ -1182,6 +1186,11 @@ $(BYTELOADER_DLL): $(PERLEXE) $(BYTELOADER).xs
 	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
 	cd $(EXTDIR)\$(*B) && $(MAKE)
 
+$(ENCODE_DLL): $(PERLEXE) $(ENCODE).xs
+	cd $(EXTDIR)\$(*B) && \
+	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+	cd $(EXTDIR)\$(*B) && $(MAKE)
+
 $(STORABLE_DLL): $(PERLEXE) $(STORABLE).xs
 	cd $(EXTDIR)\$(*B) && \
 	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl