X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2FMakefile.SH;h=ba56c49e7ba93e79c883f5cd85939be4fd526bf2;hb=55b6781562aff32ef6499c4f263ab251254ca5cb;hp=68c63a774428a54b5f8172be3ac398254ca7f77e;hpb=40fee94577535e58810d39c7cb522a3551ea435a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 68c63a7..ba56c49 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -39,7 +39,7 @@ LDFLAGS = $ldflags
 #mallocobj = $mallocobj
 shellflags = $shellflags
 
-libs = $libs
+libs = $perllibs
 
 $make_set_make
 # grrr
@@ -47,7 +47,7 @@ SHELL = $sh
 
 # These variables may need to be manually set for non-Unix systems.
 AR = $ar
-EXE_EXT = $_ext
+EXE_EXT = $_exe
 LIB_EXT = $_a
 OBJ_EXT = $_o
 PATH_SEP = $p_
@@ -62,6 +62,8 @@ OPTIMIZE = $optimize
 
 .SUFFIXES: .c \$(OBJ_EXT)
 
+RUN = $run
+
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
@@ -69,7 +71,7 @@ cat >>Makefile <<'!NO!SUBS!'
 REALPERL = ../perl
 CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@`
 
-public = a2p s2p find2perl
+public = a2p$(EXE_EXT) s2p find2perl
 
 private = 
 
@@ -103,20 +105,15 @@ lintflags = -phbvxac
 all: $(public) $(private) $(util)
 	@echo " "
 
-compile: all
-	$(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
-
-check_byacc:
-	@$(BYACC) -V 2>&1 | grep 'version 1\.8\.2'
+#    make run_byacc
+# byacc 1.8.2 or 1.9 are recommended.
 
-run_byacc:	FORCE check_byacc
+run_byacc:	FORCE
 	@ echo Expect many shift/reduce and reduce/reduce conflicts
 	$(BYACC) a2p.y
 	rm -f a2p.c
@@ -127,6 +124,9 @@ run_byacc:	FORCE check_byacc
 	    -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:
@@ -141,11 +141,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
@@ -173,7 +174,11 @@ shlist:
 # These should be automatically generated
 
 $(plextract):
-	../miniperl -I../lib $@.PL
+	$(RUN) ../miniperl -I../lib $@.PL
+
+find2perl: find2perl.PL
+
+s2p: s2p.PL
 
 malloc.c: ../malloc.c
 	rm -f malloc.c