diff options
| author | Steve Hay <SteveHay@planit.com> | 2005-04-28 11:13:55 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2005-04-28 11:13:55 +0000 |
| commit | 9dcb96024af7087d05f03617e991e04fef9ff716 (patch) | |
| tree | e364947737e692813eb64b171df9550479c5b943 /win32 | |
| parent | 4cb1c523c98f570fe603f3ae31d419bb956906d9 (diff) | |
| download | perl-9dcb96024af7087d05f03617e991e04fef9ff716.tar.gz | |
Remove temporary clean-up from Win32 makefiles
Change 22501 temporarily added some clean-up to the Win32 makefiles
which was only meant to stay until cpan rt #5616 was fixed. It is
now fixed (in EU-MM 6.22, which in turn has been in blead for a
while now), so these hacks are no longer required.
This change is also good for maint, which currently contains EU-MM
6.17, which didn't create the blibdirs.exists files in question
anyway.
p4raw-id: //depot/perl@24347
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 9 | ||||
| -rw-r--r-- | win32/makefile.mk | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/win32/Makefile b/win32/Makefile index fdac9c1993..6b12a9dd1a 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1015,25 +1015,20 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs -#---------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- Extensions: buildext.pl $(PERLDEP) $(CONFIGPM) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext -# Note: The next two targets explicitly remove a "blibdirs.exists" file that -# currerntly gets left behind, until CPAN RT Ticket #5616 is resolved. - Extensions_clean: -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext clean - -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists Extensions_realclean: -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext realclean - -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists -#---------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- doc: $(PERLEXE) $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \ diff --git a/win32/makefile.mk b/win32/makefile.mk index 92cd12b849..f0ccd9cf83 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1175,7 +1175,7 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs -#---------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- Extensions : buildext.pl $(PERLDEP) $(CONFIGPM) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --dynamic $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic @@ -1184,20 +1184,15 @@ Extensions_static : buildext.pl $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --static -# Note: The next two targets explicitly remove a "blibdirs.exists" file that -# currerntly gets left behind, until CPAN RT Ticket #5616 is resolved. - Extensions_clean : -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext clean - -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists Extensions_realclean : -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext realclean - -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists -#---------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- doc: $(PERLEXE) |