PATCH s2p.PL

[p5sagit/p5-mst-13.2.git] / x2p / Makefile.SH

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 240725a..003c6e2 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=..;
@@ -34,10 +34,7 @@ cat >Makefile <<!GROK!THIS!
 CC = $cc
 BYACC = $byacc
 LDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-# XXX Perl malloc temporarily unusable (declaration collisions with
-# stdlib.h)
+# XXX Perl malloc temporarily unusable (declaration collisions with stdlib.h)
 #mallocsrc = $mallocsrc
 #mallocobj = $mallocobj
 shellflags = $shellflags
@@ -61,22 +58,18 @@ FIRSTMAKEFILE = $firstmakefile
 
 TRNL = '$trnl'
 
-.SUFFIXES: .c \$(OBJ_EXT)
-
-# this is where the sources are
-src    = $src
+OPTIMIZE = $optimize
 
-# nice makes grok this
-#VPATH = .:$src
+.SUFFIXES: .c \$(OBJ_EXT)
 
 !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 = 
 
@@ -95,9 +88,9 @@ plm   = a2p.loadmap
 
 addedbyconf = $(shextract) $(plextract)
 
-h = EXTERN.h INTERN.h ../config.h handy.h hash.h a2p.h str.h util.h
+h = EXTERN.h INTERN.h ../config.h ../handy.h hash.h a2p.h str.h util.h
 
-c = hash.c str.c util.c walk.c
+c = hash.c $(mallocsrc) str.c util.c walk.c
 
 obj = hash$(OBJ_EXT) $(mallocobj) str$(OBJ_EXT) util$(OBJ_EXT) walk$(OBJ_EXT)
 
@@ -111,20 +104,30 @@ 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
 
-run_byacc:     FORCE
+check_byacc:
+       @$(BYACC) -V 2>&1 | grep 'version 1\.8\.2'
+
+run_byacc:     FORCE check_byacc
        @ 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:
 
@@ -135,15 +138,18 @@ a2p.c: a2p.y
 
 a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h \
                ../handy.h ../config.h str.h hash.h
-       $(CCCMD) $(LARGE) a2p.c
+       $(CCCMD) a2p.c
 
 clean:
-       rm -f a2p *$(OBJ_EXT) $(plexe) $(plc) $(plm)
+       rm -f a2p$(EXE_EXT) psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
 
 realclean: clean
-       rm -f *.orig core $(addedbyconf) all malloc.c
+       rm -f core $(addedbyconf) all malloc.c
        rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
 
+veryclean: realclean
+       rm -f *~ *.orig
+
 # The following lint has practically everything turned on.  Unfortunately,
 # you have to wade through a lot of mumbo jumbo that can't be suppressed.
 # If the source file has a /*NOSTRICT*/ somewhere, ignore the lint message
@@ -153,7 +159,7 @@ lint:
        lint $(lintflags) $(defs) $(c) > a2p.fuzz
 
 depend: $(mallocsrc) ../makedepend
-       sh ../makedepend MAKE=$(MAKE) src=$(src)/x2p
+       sh ../makedepend MAKE=$(MAKE)
 
 clist:
        echo $(c) | tr ' ' $(TRNL) >.clist