summaryrefslogtreecommitdiff
path: root/Makefile.SH
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2013-07-04 11:28:53 +0200
committerNicholas Clark <nick@ccl4.org>2013-07-07 12:52:36 +0200
commit7b4d95f74b61267ca3d460b061b824f1374b2672 (patch)
treea4b602b00f32a800526dbf55667276a1aa78b8f4 /Makefile.SH
parent17f4bbffad1ab0f526587d262bbed2534da5312b (diff)
downloadperl-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 'Makefile.SH')
-rwxr-xr-xMakefile.SH7
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.SH b/Makefile.SH
index 2d5006d6dc..9ef70bd5aa 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -453,7 +453,7 @@ shextract=`SH_to_target $SH`
## In the following dollars and backticks do not need the extra backslash.
$spitshell >>$Makefile <<!GROK!THIS!
-private = preplibrary \$(CONFIGPM) \$(CONFIGPOD) lib/ExtUtils/Miniperl.pm git_version.h lib/buildcustomize.pl
+private = preplibrary \$(CONFIGPM) \$(CONFIGPOD) git_version.h lib/buildcustomize.pl
# Files to be built with variable substitution before miniperl
# is available.
@@ -684,7 +684,7 @@ generate_uudmap$(OBJ_EXT): mg_raw.h
generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
$(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs)
-perlmain.c: $(MINIPERL_EXE) lib/ExtUtils/Miniperl.pm
+perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib
$(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(@ARGV)' DynaLoader $(static_ext) > perlmain.c
# The file ext.libs is a list of libraries that must be linked in
@@ -978,9 +978,6 @@ $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD)
$(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git.pl
$(MINIPERL) configpm
-lib/ExtUtils/Miniperl.pm: miniperlmain.c $(MINIPERL_EXE) minimod.pl $(CONFIGPM)
- $(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm
-
unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data
uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)