X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2FMakefile.SH;h=1b48753bff7d0fdc75de5908467579df9643f7fa;hb=4cec2b33f0aa04d807b9b31c6b4212fe462cd7d4;hp=ea11ced16ca22e45b481cdf1a87e31a3ace65a92;hpb=6189dba15326c2d5fa89d15d2ce49c7afd8b719a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index ea11ced..1b48753 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
@@ -69,7 +69,7 @@ cat >>Makefile <<'!NO!SUBS!'
 REALPERL = ../perl
 CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@`
 
-public = a2p s2p find2perl
+public = a2p$(EXE_EXT) s2p find2perl
 
 private = 
 
@@ -106,17 +106,15 @@ all: $(public) $(private) $(util)
 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
+#    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
@@ -144,8 +142,9 @@ clean:
 	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
@@ -175,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 \