update Changes

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

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 65a3d75..30201bd 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -46,13 +46,12 @@ $make_set_make
 # grrr
 SHELL = $sh
 
-# These variables will be used in a future version to make
-# the make file more portable to non-unix systems.
+# 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
 
@@ -62,6 +61,7 @@ FIRSTMAKEFILE = $firstmakefile
 
 cat >>Makefile <<'!NO!SUBS!'
 
+REALPERL = ../perl
 CCCMD = `sh $(shellflags) cflags $@`
 
 public = a2p s2p find2perl
@@ -77,6 +77,8 @@ shextract = Makefile cflags
 
 pl = find2perl.PL s2p.PL
 plextract = find2perl s2p
+plexe = find2perl.exe s2p.exe
+plc   = find2perl.c s2p.c
 
 addedbyconf = $(shextract) $(plextract)
 
@@ -95,6 +97,9 @@ lintflags = -phbvxac
 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) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs) -o a2p
 
@@ -117,7 +122,7 @@ a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.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
@@ -153,7 +158,8 @@ malloc.c: ../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):