update Changes

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

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
old mode 100644 (file)
new mode 100755 (executable)
index 260cfa4..30201bd
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -14,52 +14,54 @@ esac
 : This forces SH files to create target in same directory as SH file.
 : This is so that make depend always knows where to find SH derivatives.
 case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
+*/Makefile.SH) cd `expr X$0 : 'X\(.*\)/'` ;;
+Makefile.SH) ;;
+*) case `pwd` in
+   */x2p) ;;
+   *) if test -d x2p; then cd x2p
+      else echo "Can't figure out where to write output."; exit 1
+         fi;;
+   esac;;
 esac
 
-: ${bin_sh=/bin/sh}
-
 echo "Extracting x2p/Makefile (with variable substitutions)"
 rm -f Makefile
 cat >Makefile <<!GROK!THIS!
-# $RCSfile: Makefile.SH,v $$Revision: 4.1 $$Date: 1996/07/05 23:49:56 $
+# $RCSfile: Makefile.SH,v $$Revision: 4.1 $$Date: 92/08/07 18:29:07 $
 #
 # $Log:        Makefile.SH,v $
-# Revision 1.2  1996/07/05 23:49:56  gerti
-# OPENSTEP 4.0 patches
-#
 
 CC = $cc
 BYACC = $byacc
 LDFLAGS = $ldflags
 SMALL = $small
 LARGE = $large $split
-MAB = $mab
 mallocsrc = $mallocsrc
 mallocobj = $mallocobj
 shellflags = $shellflags
 
 libs = $libs
 
-# These variables will be used in a future version to make
-# the make file more portable to non-unix systems.
+$make_set_make
+# grrr
+SHELL = $sh
+
+# These variables may need to be manually set for non-Unix systems.
 AR = $ar
-EXE_EXT = $exe_ext
-LIB_EXT = $lib_ext
-OBJ_EXT = $obj_ext
-PATH_SEP = $path_sep
+EXE_EXT = $_ext
+LIB_EXT = $_a
+OBJ_EXT = $_o
+PATH_SEP = $p_
 
 FIRSTMAKEFILE = $firstmakefile
 
 .SUFFIXES: .c \$(OBJ_EXT)
 
-# grrr
-SHELL = $bin_sh
-
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
 
+REALPERL = ../perl
 CCCMD = `sh $(shellflags) cflags $@`
 
 public = a2p s2p find2perl
@@ -75,10 +77,12 @@ shextract = Makefile cflags
 
 pl = find2perl.PL s2p.PL
 plextract = find2perl s2p
+plexe = find2perl.exe s2p.exe
+plc   = find2perl.c s2p.c
 
 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 $(mallocsrc) str.c util.c walk.c
 
@@ -86,14 +90,18 @@ obj = hash$(OBJ_EXT) $(mallocobj) str$(OBJ_EXT) util$(OBJ_EXT) walk$(OBJ_EXT)
 
 lintflags = -phbvxac
 
+
 .c$(OBJ_EXT):
-       $(CCCMD) $(MAB) -DPERL_FOR_X2P $*.c
+       $(CCCMD) -DPERL_FOR_X2P $*.c
 
 all: $(public) $(private) $(util)
        touch all
 
+compile: all
+       $(REALPERL) -I../lib ../utils/perlcc -regex 's/$$/.exe/' $(plextract) -prog -verbose dcf -log ../compilelog;  
+
 a2p: $(obj) a2p$(OBJ_EXT)
-       $(CC) $(MAB) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs) -o a2p
+       $(CC) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs) -o a2p
 
 # I now supply a2p.c with the kits, so the following section is
 # used only if you force byacc to run by saying
@@ -109,11 +117,12 @@ run_byacc:        FORCE
 a2p.c: a2p.y
        -@touch a2p.c
 
-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) $(MAB) -DPERL_FOR_X2P a2p.c
+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
 
 clean:
-       rm -f a2p *$(OBJ_EXT)
+       rm -f a2p *$(OBJ_EXT) $(plexe) $(plc)
 
 realclean: clean
        rm -f *.orig core $(addedbyconf) all malloc.c
@@ -128,7 +137,7 @@ lint:
        lint $(lintflags) $(defs) $(c) > a2p.fuzz
 
 depend: $(mallocsrc) ../makedepend
-       sh ../makedepend
+       sh ../makedepend MAKE=$(MAKE)
 
 clist:
        echo $(c) | tr ' ' '\012' >.clist
@@ -147,8 +156,10 @@ $(plextract):
 malloc.c: ../malloc.c
        rm -f malloc.c
        sed <../malloc.c >malloc.c \
+           -e 's/"EXTERN.h"/"..\/EXTERN.h"/' \
            -e 's/"perl.h"/"..\/perl.h"/' \
-           -e 's/my_exit/exit/'
+           -e 's/my_exit/exit/' \
+           -e 's/MUTEX_[A-Z_]*(&malloc_mutex);//'
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
 $(obj):