summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2013-05-15 21:26:59 +0200
committerNicholas Clark <nick@ccl4.org>2013-05-20 21:50:45 +0200
commit6105164f37e277ea0eb5dec4a432b86b49489be1 (patch)
treef9e62de7cc6fe947130df859dd1f5c676f045a2c
parent655e5c9e391de4eef96d3ad88908a53cddbf53e3 (diff)
downloadperl-6105164f37e277ea0eb5dec4a432b86b49489be1.tar.gz
Add x2p/Makefile.SH to the *.SH files processed by the top level Makefile.
This makes the top level Makefile responsible for deleting x2p/Makefile. With this, we can eliminate the 'sh' and 'shextract' from x2p's Makefile.
-rwxr-xr-xMakefile.SH2
-rwxr-xr-xx2p/Makefile.SH5
2 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.SH b/Makefile.SH
index 820134f9c3..1ea97fcca1 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -447,7 +447,7 @@ SH_to_target() {
echo $@ | sed -e s/\\\.SH//g -e s/_/./g
}
-SH='Makefile.SH cflags.SH config_h.SH makedepend.SH myconfig.SH runtests.SH pod/Makefile.SH'
+SH='Makefile.SH cflags.SH config_h.SH makedepend.SH myconfig.SH runtests.SH pod/Makefile.SH x2p/Makefile.SH'
shextract=`SH_to_target $SH`
## In the following dollars and backticks do not need the extra backslash.
diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 1d4a4a5603..eae3e6f090 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -87,16 +87,13 @@ manpages = a2p.man s2p.man
util =
-sh = Makefile.SH
-shextract = Makefile
-
pl = find2perl.PL s2p.PL
plextract = find2perl s2p
plexe = find2perl.exe s2p.exe
plc = find2perl.c s2p.c
plm = a2p.loadmap
-addedbyconf = $(shextract) $(plextract)
+addedbyconf = $(plextract)
h = EXTERN.h INTERN.h ../config.h ../handy.h hash.h a2p.h str.h util.h