assert() that we can't reach two unreachable code paths

[perl5.git] / x2p / Makefile.SH

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 25085fc..1b48753 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -1,4 +1,4 @@
-case $CONFIGDOTSH in
+case $PERL_CONFIG_SH in
 '')
        if test -f config.sh; then TOP=.;
        elif test -f ../config.sh; then TOP=..;
@@ -39,7 +39,7 @@ LDFLAGS = $ldflags
 #mallocobj = $mallocobj
 shellflags = $shellflags
 
-libs = $libs
+libs = $perllibs
 
 $make_set_make
 # grrr
@@ -58,6 +58,8 @@ FIRSTMAKEFILE = $firstmakefile
 
 TRNL = '$trnl'
 
+OPTIMIZE = $optimize
+
 .SUFFIXES: .c \$(OBJ_EXT)
 
 !GROK!THIS!
@@ -65,9 +67,9 @@ TRNL = '$trnl'
 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 = 
 
@@ -102,20 +104,28 @@ all: $(public) $(private) $(util)
        @echo " "
 
 compile: all
-       $(REALPERL) -I../lib ../utils/perlcc -regex 's/$$/.exe/' $(plextract) -prog -verbose dcf -log ../compilelog;  
+       $(REALPERL) -I../lib ../utils/perlcc -I .. -L .. $(plextract) -v -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
-# make  run_byacc
+#    make run_byacc
+# byacc 1.8.2 or 1.9 are recommended.
 
 run_byacc:     FORCE
        @ echo Expect many shift/reduce and reduce/reduce conflicts
        $(BYACC) a2p.y
        rm -f a2p.c
-       mv y.tab.c a2p.c
+       sed -e 's/(yyn = yydefred\[yystate\])/((yyn = yydefred[yystate]))/' \
+           -e 's/(yys = getenv("YYDEBUG"))/((yys = getenv("YYDEBUG")))/' \
+           -e 's/^yyerrlab://' \
+           -e 's/^    goto yyerrlab;//' \
+           -e 's/^yynewerror://' \
+           -e 's/^    goto yynewerror;//' \
+           -e 's|^static char yysccsid\(.*\)|/* static char yysccsid\1 */|' \
+           < y.tab.c > a2p.c
 
 FORCE:
 
@@ -129,11 +139,12 @@ a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h \
        $(CCCMD) a2p.c
 
 clean:
-       rm -f a2p psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
+       rm -f a2p$(EXE_EXT) psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
 
 realclean: clean
+       -rmdir .depending
        rm -f core $(addedbyconf) all malloc.c
-       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
+       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
 
 veryclean: realclean
        rm -f *~ *.orig
@@ -163,6 +174,10 @@ shlist:
 $(plextract):
        ../miniperl -I../lib $@.PL
 
+find2perl: find2perl.PL
+
+s2p: s2p.PL
+
 malloc.c: ../malloc.c
        rm -f malloc.c
        sed <../malloc.c >malloc.c \