diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2015-11-05 17:36:11 +0000 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2015-11-05 17:36:11 +0000 |
| commit | 771d08d04402e3fb2c253e6bf8b46524b761a020 (patch) | |
| tree | cce6abf6ffe42a8340ea7df01f935f86ddf65c73 /win32 | |
| parent | eb840d4ab69d8844753dfefe934e921ba27e0f91 (diff) | |
| download | perl-771d08d04402e3fb2c253e6bf8b46524b761a020.tar.gz | |
Update other win32/ makefiles as per eb840d4ab6
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/GNUmakefile | 8 | ||||
| -rw-r--r-- | win32/Makefile | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/win32/GNUmakefile b/win32/GNUmakefile index 8677717c3d..120ead7584 100644 --- a/win32/GNUmakefile +++ b/win32/GNUmakefile @@ -757,9 +757,6 @@ $(GLOBEXE) : perlglob$(o) perlglob$(o) : perlglob.c -config.w32 : $(CFGSH_TMPL) - copy $(CFGSH_TMPL) config.w32 - # # Copy the template config.h and set configurables at the end of it # as per the options chosen and compiler used. @@ -925,8 +922,8 @@ endif # make sure that we recompile perl.c if the git version changes ..\perl$(o) : ..\git_version.h -..\config.sh : config.w32 $(MINIPERL) config_sh.PL FindExt.pm - $(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) config.w32 > ..\config.sh +..\config.sh : $(CFGSH_TMPL) config_sh.PL FindExt.pm $(MINIPERL) + $(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh # This target is for when changes to the main config.sh happen. # Edit config.gc, then make perl using GCC in a minimal configuration (i.e. @@ -1338,7 +1335,6 @@ _clean : -@erase perlglob$(o) -@erase perlmain$(o) -@erase perlmainst$(o) - -@erase config.w32 -@erase /f config.h -@erase /f ..\git_version.h -@erase $(GLOBEXE) diff --git a/win32/Makefile b/win32/Makefile index bbe75f87ba..19142ba477 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -916,9 +916,6 @@ $(GLOBEXE) : perlglob$(o) perlglob$(o) : perlglob.c -config.w32 : $(CFGSH_TMPL) - copy $(CFGSH_TMPL) config.w32 - # # Copy the template config.h and set configurables at the end of it # as per the options chosen and compiler used. @@ -1020,8 +1017,8 @@ config.w32 : $(CFGSH_TMPL) # make sure that we recompile perl.c if the git version changes ..\perl$(o) : ..\git_version.h -..\config.sh : config.w32 $(MINIPERL) config_sh.PL FindExt.pm - $(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) config.w32 > ..\config.sh +..\config.sh : $(CFGSH_TMPL) config_sh.PL FindExt.pm $(MINIPERL) + $(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh # This target is for when changes to the main config.sh happen. # Edit config.vc, then make perl in a minimal configuration (i.e. with MULTI, @@ -1424,7 +1421,6 @@ _clean : -@$(DEL) perlglob$(o) -@$(DEL) perlmain$(o) -@$(DEL) perlmainst$(o) - -@$(DEL) config.w32 -@$(DEL) config.h -@$(DEL) ..\git_version.h -@$(DEL) $(GLOBEXE) |