From: Gurusamy Sarathy <gsar@cpan.org>
Date: Fri, 15 May 1998 04:59:47 +0000 (+0000)
Subject: [win32] tweaks to win32 makefiles.  This version builds and passes all
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a1dd93259a6bf8541f88c948d6f510cc5090ff8e;p=p5sagit%2Fp5-mst-13.2.git

[win32] tweaks to win32 makefiles.  This version builds and passes all
tests on Solaris/gcc, win32/[bv]c.  Looks all set to go.

p4raw-id: //depot/win32/perl@979
---

diff --git a/win32/Makefile b/win32/Makefile
index 4a518fb..d860a3c 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -25,12 +25,14 @@ INST_TOP	= $(INST_DRV)\perl5004.5x
 
 #
 # if you have the source for des_fcrypt(), uncomment this and make sure the
-# file exists (see README.win32)
+# file exists (see README.win32).  File should be located at the perl
+# top level directory.
 #CRYPT_SRC	= des_fcrypt.c
 
 #
 # if you didn't set CRYPT_SRC and if you have des_fcrypt() available in a
 # library, uncomment this, and make sure the library exists (see README.win32)
+# Specify the full pathname of the library.
 #CRYPT_LIB	= des_fcrypt.lib
 
 #
@@ -254,7 +256,9 @@ CORE_SRC	=		\
 		..\universal.c	\
 		..\util.c
 
-CORE_SRC	= $(CORE_SRC) $(CRYPT_SRC)
+!IF "$(CRYPT_SRC)" != ""
+CORE_SRC	= $(CORE_SRC) ..\$(CRYPT_SRC)
+!ENDIF
 
 !IF "$(PERL_MALLOC)" == "define"
 CORE_SRC	= $(CORE_SRC) ..\malloc.c
@@ -277,6 +281,10 @@ PERL95_SRC	=		\
 		win32mt.c	\
 		win32sckmt.c
 
+!IF "$(CRYPT_SRC)" != ""
+PERL95_SRC	= $(PERL95_SRC) ..\$(CRYPT_SRC)
+!ENDIF
+
 DLL_SRC		= $(DYNALOADER).c
 
 
@@ -550,6 +558,9 @@ $(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ)
 
 $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
 	if not exist $(AUTODIR) mkdir $(AUTODIR)
+	cd $(EXTDIR)\$(*B)
+	..\$(MINIPERL) -I..\..\lib $(*B).pm.PL
+	cd ..\..\win32
 	$(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
 	cd $(EXTDIR)\$(*B)
 	$(XSUBPP) dl_win32.xs > $(*B).c
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 17dda74..e77713c 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -32,12 +32,14 @@ CCTYPE		*= BORLAND
 
 #
 # if you have the source for des_fcrypt(), uncomment this and make sure the
-# file exists (see README.win32)
+# file exists (see README.win32).  File should be located at the perl
+# top level directory.
 #CRYPT_SRC	*= des_fcrypt.c
 
 #
 # if you didn't set CRYPT_SRC and if you have des_fcrypt() available in a
 # library, uncomment this, and make sure the library exists (see README.win32)
+# Specify the full pathname of the library.
 #CRYPT_LIB	*= des_fcrypt.lib
 
 #
@@ -362,7 +364,9 @@ CORE_SRC	=		\
 		..\universal.c	\
 		..\util.c
 
-CORE_SRC	+= $(CRYPT_SRC)
+.IF "$(CRYPT_SRC)" != ""
+CORE_SRC	+= ..\$(CRYPT_SRC)
+.ENDIF
 
 .IF "$(PERL_MALLOC)" == "define"
 CORE_SRC	+= ..\malloc.c
@@ -385,6 +389,10 @@ PERL95_SRC	=		\
 		win32mt.c	\
 		win32sckmt.c
 
+.IF "$(CRYPT_SRC)" != ""
+PERL95_SRC	+= ..\$(CRYPT_SRC)
+.ENDIF
+
 DLL_SRC		= $(DYNALOADER).c
 
 
@@ -727,6 +735,7 @@ $(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ)
 
 $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
 	if not exist $(AUTODIR) mkdir $(AUTODIR)
+	cd $(EXTDIR)\$(*B) && ..\$(MINIPERL) -I..\..\lib $(*B).pm.PL
 	$(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
 	cd $(EXTDIR)\$(*B) && $(XSUBPP) dl_win32.xs > $(*B).c
 	$(XCOPY) $(EXTDIR)\$(*B)\dlutils.c .