This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change utf8.t to use a \xb7 delimiter once more.
[perl5.git]
/
x2p
/
Makefile.SH
diff --git
a/x2p/Makefile.SH
b/x2p/Makefile.SH
index
3dedb47
..
127d6f9
100755
(executable)
--- a/
x2p/Makefile.SH
+++ b/
x2p/Makefile.SH
@@
-1,4
+1,4
@@
-case $PERL_CONFIG_
T
SH in
+case $PERL_CONFIG_SH in
'')
if test -f config.sh; then TOP=.;
elif test -f ../config.sh; then TOP=..;
'')
if test -f config.sh; then TOP=.;
elif test -f ../config.sh; then TOP=..;
@@
-26,6
+26,14
@@
esac
echo "Extracting x2p/Makefile (with variable substitutions)"
rm -f Makefile
echo "Extracting x2p/Makefile (with variable substitutions)"
rm -f Makefile
+
+# The .PL extractions use the Cwd extension. For statically-built
+# perls, we need perl, not just miniperl.
+case "$usedl" in
+ define) perl="../miniperl" ;;
+ *) perl="../perl" ;;
+esac
+
cat >Makefile <<!GROK!THIS!
# $RCSfile: Makefile.SH,v $$Revision: 4.1 $$Date: 92/08/07 18:29:07 $
#
cat >Makefile <<!GROK!THIS!
# $RCSfile: Makefile.SH,v $$Revision: 4.1 $$Date: 92/08/07 18:29:07 $
#
@@
-39,7
+47,7
@@
LDFLAGS = $ldflags
#mallocobj = $mallocobj
shellflags = $shellflags
#mallocobj = $mallocobj
shellflags = $shellflags
-libs = $libs
+libs = $
perl
libs
$make_set_make
# grrr
$make_set_make
# grrr
@@
-47,7
+55,7
@@
SHELL = $sh
# These variables may need to be manually set for non-Unix systems.
AR = $ar
# These variables may need to be manually set for non-Unix systems.
AR = $ar
-EXE_EXT = $_ex
t
+EXE_EXT = $_ex
e
LIB_EXT = $_a
OBJ_EXT = $_o
PATH_SEP = $p_
LIB_EXT = $_a
OBJ_EXT = $_o
PATH_SEP = $p_
@@
-58,16
+66,21
@@
FIRSTMAKEFILE = $firstmakefile
TRNL = '$trnl'
TRNL = '$trnl'
+OPTIMIZE = $optimize
+
.SUFFIXES: .c \$(OBJ_EXT)
.SUFFIXES: .c \$(OBJ_EXT)
+RUN = $run
+PERL = $perl
+
!GROK!THIS!
cat >>Makefile <<'!NO!SUBS!'
REALPERL = ../perl
!GROK!THIS!
cat >>Makefile <<'!NO!SUBS!'
REALPERL = ../perl
-CCCMD = `sh $(shellflags) cflags $@`
+CCCMD = `sh $(shellflags) cflags
"optimize='$(OPTIMIZE)'"
$@`
-public = a2p s2p find2perl
+public = a2p
$(EXE_EXT)
s2p find2perl
private =
private =
@@
-101,20
+114,15
@@
lintflags = -phbvxac
all: $(public) $(private) $(util)
@echo " "
all: $(public) $(private) $(util)
@echo " "
-compile: all
- $(REALPERL) -I../lib ../utils/perlcc -regex 's/$$/.exe/' $(plextract) -prog -verbose dcf -log ../compilelog;
-
-a2p: $(obj) a2p$(OBJ_EXT)
+a2p$(EXE_EXT): $(obj) a2p$(OBJ_EXT)
$(CC) -o a2p $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs)
# I now supply a2p.c with the kits, so the following section is
# used only if you force byacc to run by saying
$(CC) -o a2p $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs)
# I now supply a2p.c with the kits, so the following section is
# used only if you force byacc to run by saying
-# make run_byacc
+# make run_byacc
+# byacc 1.8.2 or 1.9 are recommended.
-check_byacc:
- @$(BYACC) -V 2>&1 | grep 'version 1\.8\.2'
-
-run_byacc: FORCE check_byacc
+run_byacc: FORCE
@ echo Expect many shift/reduce and reduce/reduce conflicts
$(BYACC) a2p.y
rm -f a2p.c
@ echo Expect many shift/reduce and reduce/reduce conflicts
$(BYACC) a2p.y
rm -f a2p.c
@@
-125,6
+133,9
@@
run_byacc: FORCE check_byacc
-e 's/^yynewerror://' \
-e 's/^ goto yynewerror;//' \
-e 's|^static char yysccsid\(.*\)|/* static char yysccsid\1 */|' \
-e 's/^yynewerror://' \
-e 's/^ goto yynewerror;//' \
-e 's|^static char yysccsid\(.*\)|/* static char yysccsid\1 */|' \
+ -e 's/^\(char \*yyname\[\]\)/const \1/' \
+ -e 's/^\(char \*yyrule\[\]\)/const \1/' \
+ -e 's/^\( register\) \(char \*yys;\)/\1 const \2/' \
< y.tab.c > a2p.c
FORCE:
< y.tab.c > a2p.c
FORCE:
@@
-139,11
+150,14
@@
a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h \
$(CCCMD) a2p.c
clean:
$(CCCMD) a2p.c
clean:
- rm -f a2p psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
+ rm -f a2p$(EXE_EXT) psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
+
+distclean: veryclean
realclean: clean
realclean: clean
+ -rmdir .depending
rm -f core $(addedbyconf) all malloc.c
rm -f core $(addedbyconf) all malloc.c
- rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
+ rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
makefile.old
veryclean: realclean
rm -f *~ *.orig
veryclean: realclean
rm -f *~ *.orig
@@
-168,10
+182,12
@@
hlist:
shlist:
echo $(sh) | tr ' ' $(TRNL) >.shlist
shlist:
echo $(sh) | tr ' ' $(TRNL) >.shlist
-# These should be automatically generated
-
$(plextract):
$(plextract):
- ../miniperl -I../lib $@.PL
+ $(RUN) $(PERL) -I../lib $@.PL
+
+find2perl: find2perl.PL
+
+s2p: s2p.PL
malloc.c: ../malloc.c
rm -f malloc.c
malloc.c: ../malloc.c
rm -f malloc.c