Fix to installing non-xs ext's in priv lib

[perl5.git] / x2p / Makefile.SH

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 0ca3ff3..ba56c49 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -1,4 +1,4 @@
-case $CONFIG in
+case $PERL_CONFIG_SH in
 '')
        if test -f config.sh; then TOP=.;
        elif test -f ../config.sh; then TOP=..;
@@ -34,37 +34,44 @@ cat >Makefile <<!GROK!THIS!
 CC = $cc
 BYACC = $byacc
 LDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-mallocsrc = $mallocsrc
-mallocobj = $mallocobj
+# XXX Perl malloc temporarily unusable (declaration collisions with stdlib.h)
+#mallocsrc = $mallocsrc
+#mallocobj = $mallocobj
 shellflags = $shellflags
 
-libs = $libs
+libs = $perllibs
 
 $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 = $_exe
+LIB_EXT = $_a
+OBJ_EXT = $_o
+PATH_SEP = $p_
 
 FIRSTMAKEFILE = $firstmakefile
 
+# how to tr(anslate) newlines
+
+TRNL = '$trnl'
+
+OPTIMIZE = $optimize
+
 .SUFFIXES: .c \$(OBJ_EXT)
 
+RUN = $run
+
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
 
-CCCMD = `sh $(shellflags) cflags $@`
+REALPERL = ../perl
+CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@`
 
-public = a2p s2p find2perl
+public = a2p$(EXE_EXT) s2p find2perl
 
 private = 
 
@@ -77,6 +84,9 @@ shextract = Makefile cflags
 
 pl = find2perl.PL s2p.PL
 plextract = find2perl s2p
+plexe = find2perl.exe s2p.exe
+plc   = find2perl.c s2p.c
+plm   = a2p.loadmap
 
 addedbyconf = $(shextract) $(plextract)
 
@@ -93,35 +103,53 @@ lintflags = -phbvxac
        $(CCCMD) -DPERL_FOR_X2P $*.c
 
 all: $(public) $(private) $(util)
-       touch all
+       @echo " "
 
-a2p: $(obj) a2p$(OBJ_EXT)
-       $(CC) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs) -o a2p
+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.
 
 run_byacc:     FORCE
        @ echo Expect many shift/reduce and reduce/reduce conflicts
        $(BYACC) a2p.y
-       mv y.tab.c a2p.c
+       rm -f 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 */|' \
+           -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:
 
 # We don't want to regenerate a2p.c, but it might appear out-of-date
 # after a patch is applied or a new distribution is made.
 a2p.c: a2p.y
-       -@touch a2p.c
+       -@sh -c true
 
 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)
+       rm -f a2p$(EXE_EXT) psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
 
 realclean: clean
-       rm -f *.orig core $(addedbyconf) all malloc.c
-       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
+       -rmdir .depending
+       rm -f core $(addedbyconf) all malloc.c
+       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.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.
@@ -132,28 +160,33 @@ lint:
        lint $(lintflags) $(defs) $(c) > a2p.fuzz
 
 depend: $(mallocsrc) ../makedepend
-       sh ../makedepend
+       sh ../makedepend MAKE=$(MAKE)
 
 clist:
-       echo $(c) | tr ' ' '\012' >.clist
+       echo $(c) | tr ' ' $(TRNL) >.clist
 
 hlist:
-       echo $(h) | tr ' ' '\012' >.hlist
+       echo $(h) | tr ' ' $(TRNL) >.hlist
 
 shlist:
-       echo $(sh) | tr ' ' '\012' >.shlist
+       echo $(sh) | tr ' ' $(TRNL) >.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
        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_]*(&PL_malloc_mutex);//'
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
 $(obj):