summaryrefslogtreecommitdiff
path: root/win32/makefile.mk
diff options
context:
space:
mode:
authorYves Orton <demerphq@gmail.com>2006-12-20 17:00:33 +0100
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2006-12-20 16:13:32 +0000
commit1266ad8f485f435b89a025d0463af17ae6a66f3c (patch)
tree9f9dd7dd1985f32223519279bcb665d029f40aa7 /win32/makefile.mk
parentfaae14e6e968e1c02f36e42c867ea4746a9fde2f (diff)
downloadperl-1266ad8f485f435b89a025d0463af17ae6a66f3c.tar.gz
Re: [PATCH] Making adding binary files possible
Message-ID: <9b18b3110612200700k48157cd1n1f2305f306b7de32@mail.gmail.com> plus matching updates to Makefile.SH and patching.pod p4raw-id: //depot/perl@29604
Diffstat (limited to 'win32/makefile.mk')
-rw-r--r--win32/makefile.mk20
1 files changed, 15 insertions, 5 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 75975a0931..dcbd4aff3b 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1224,8 +1224,8 @@ $(PERLSTATICLIB): Extensions_static
.ENDIF
$(XCOPY) $(PERLSTATICLIB) $(COREDIR)
-$(PERLEXE_ICO): $(MINIPERL) makeico.pl
- $(MINIPERL) makeico.pl > $@
+$(PERLEXE_ICO): $(MINIPERL) ..\uupacktool.pl $(PERLEXE_ICO).packd
+ $(MINIPERL) -I..\lib ..\uupacktool.pl -u $(PERLEXE_ICO).packd $(PERLEXE_ICO)
$(PERLEXE_RES): perlexe.rc $(PERLEXE_ICO)
@@ -1537,7 +1537,13 @@ minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils
cd ..\t && \
$(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
-test-prep : all utils
+unpack_files:
+ $(MINIPERL) -I..\lib ..\uupacktool.pl -u -d .. -m
+
+cleanup_unpacked_files:
+ $(MINIPERL) -I..\lib ..\uupacktool.pl -c -d .. -m
+
+test-prep : all utils unpack_files
$(XCOPY) $(PERLEXE) ..\t\$(NULL)
$(XCOPY) $(PERLDLL) ..\t\$(NULL)
.IF "$(CCTYPE)" == "BORLAND"
@@ -1604,9 +1610,13 @@ _clean :
-@erase *.tds
-@erase Extensions_static
-clean : Extensions_clean _clean
-realclean : Extensions_realclean MakePPPort_clean _clean
+
+_preclean : cleanup_unpacked_files
+
+clean : _preclean Extensions_clean _clean
+
+realclean : _preclean Extensions_realclean MakePPPort_clean _clean
# Handy way to run perlbug -ok without having to install and run the
# installed perlbug. We don't re-run the tests here - we trust the user.