diff options
| author | Nicholas Clark <nick@ccl4.org> | 2013-07-04 11:28:53 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2013-07-07 12:52:36 +0200 |
| commit | 7b4d95f74b61267ca3d460b061b824f1374b2672 (patch) | |
| tree | a4b602b00f32a800526dbf55667276a1aa78b8f4 /win32/makefile.mk | |
| parent | 17f4bbffad1ab0f526587d262bbed2534da5312b (diff) | |
| download | perl-7b4d95f74b61267ca3d460b061b824f1374b2672.tar.gz | |
Move generation of ExtUtils::Miniperl to ext/ExtUtils-Miniperl from minimod.pl
It does increase the lines of code slightly but it replaces a bunch of
platform specific special case code in the Makefiles for *nix, Win32 and VMS
with one unified implementation. And in Perl, rather than 3+ different
languages.
This feels like the right maintainability trade-off.
Diffstat (limited to 'win32/makefile.mk')
| -rw-r--r-- | win32/makefile.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 6a9d6209f1..376eb5aa23 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -644,7 +644,6 @@ PERLEXESTATIC = ..\perl-static.exe STATICDIR = .\static.tmp GLOBEXE = ..\perlglob.exe CONFIGPM = ..\lib\Config.pm ..\lib\Config_heavy.pl -MINIMOD = ..\lib\ExtUtils\Miniperl.pm X2P = ..\x2p\a2p.exe GENUUDMAP = ..\generate_uudmap.exe .IF "$(BUILD_STATIC)" == "define" || "$(ALL_STATIC)" == "define" @@ -929,7 +928,7 @@ ICWD = -I..\dist\Cwd -I..\dist\Cwd\lib # all : CHECKDMAKE .\config.h ..\git_version.h $(GLOBEXE) $(MINIPERL) \ - $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) MakePPPort \ + $(CONFIGPM) $(UNIDATAFILES) MakePPPort \ $(PERLEXE) $(X2P) Extensions Extensions_nonxs $(PERLSTATIC) regnodes : ..\regnodes.h @@ -939,7 +938,7 @@ regnodes : ..\regnodes.h ..\regexec$(o) : ..\regnodes.h ..\regcharclass.h reonly : regnodes .\config.h ..\git_version.h $(GLOBEXE) $(MINIPERL) \ - $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \ + $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \ $(X2P) Extensions_reonly static: $(PERLEXESTATIC) @@ -1068,7 +1067,7 @@ regen_config_h: -$(MINIPERL) -I..\lib config_h.PL "ARCHPREFIX=$(ARCHPREFIX)" rename config.h $(CFGH_TMPL) -$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl +$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL $(MINIPERL) -I..\lib ..\configpm --chdir=.. if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL) $(XCOPY) ..\*.h $(COREDIR)\*.* @@ -1171,9 +1170,6 @@ $(PERLSTATICLIB): $(PERLDLL_OBJ) Extensions_static $(PERLEXE_RES): perlexe.rc $(PERLEXE_MANIFEST) $(PERLEXE_ICO) -$(MINIMOD) : $(MINIPERL) ..\minimod.pl - cd .. && miniperl minimod.pl > lib\ExtUtils\Miniperl.pm - ..\x2p\a2p$(o) : ..\x2p\a2p.c $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\a2p.c @@ -1346,8 +1342,7 @@ utils: $(PERLEXE) $(X2P) ..\utils\Makefile distclean: realclean -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \ - $(PERLIMPLIB) ..\miniperl$(a) $(MINIMOD) \ - $(PERLEXESTATIC) $(PERLSTATICLIB) + $(PERLIMPLIB) ..\miniperl$(a) $(PERLEXESTATIC) $(PERLSTATICLIB) -del /f *.def *.map -del /f $(LIBDIR)\Encode.pm $(LIBDIR)\encoding.pm $(LIBDIR)\Errno.pm -del /f $(LIBDIR)\Config.pod $(LIBDIR)\POSIX.pod $(LIBDIR)\threads.pm |