Re: sh Configure?

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

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 393a335..ac36250 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -14,12 +14,14 @@ 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\(.*\)/'` ;;
-esac
-
-: Configure sets byacc=byacc if byacc is not found.  We reset it to ''
-case "$byacc" in
-'byacc') byacc='';;
+*/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
 
 echo "Extracting x2p/Makefile (with variable substitutions)"
@@ -31,8 +33,6 @@ cat >Makefile <<!GROK!THIS!
 
 CC = $cc
 BYACC = $byacc
-mansrc = $mansrc
-manext = $manext
 LDFLAGS = $ldflags
 SMALL = $small
 LARGE = $large $split
@@ -41,6 +41,23 @@ mallocobj = $mallocobj
 shellflags = $shellflags
 
 libs = $libs
+
+$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.
+AR = $ar
+EXE_EXT = $exe_ext
+LIB_EXT = $lib_ext
+OBJ_EXT = $obj_ext
+PATH_SEP = $path_sep
+
+FIRSTMAKEFILE = $firstmakefile
+
+.SUFFIXES: .c \$(OBJ_EXT)
+
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
@@ -55,68 +72,55 @@ manpages = a2p.man s2p.man
 
 util =
 
-sh = Makefile.SH cflags.SH find2perl.SH s2p.SH
+sh = Makefile.SH cflags.SH
+shextract = Makefile cflags
+
+pl = find2perl.PL s2p.PL
+plextract = find2perl s2p
+
+addedbyconf = $(shextract) $(plextract)
 
 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
 
-obj = hash.o $(mallocobj) str.o util.o walk.o
+obj = hash$(OBJ_EXT) $(mallocobj) str$(OBJ_EXT) util$(OBJ_EXT) walk$(OBJ_EXT)
 
 lintflags = -phbvxac
 
-# grrr
-SHELL = /bin/sh
 
-.c.o:
-       $(CCCMD) $*.c
+.c$(OBJ_EXT):
+       $(CCCMD) -DPERL_FOR_X2P $*.c
 
 all: $(public) $(private) $(util)
        touch all
 
-a2p: $(obj) a2p.o
-       $(CC) $(LDFLAGS) $(obj) a2p.o $(libs) -o a2p
-
-!NO!SUBS!
-
-: Only print out the rules for running byacc if the user _has_ byacc.
-: Otherwise, comment them out.  Users who really know what they are
-: doing can uncomment them and run yacc or bison or whatever.
-: Configure sets byacc=byacc if byacc is not found.
-case "$byacc" in
-'')
-       comment1='#' 
-       comment2='' ;;
-*)     comment1=''
-       comment2='#' ;;
-esac
-
-$spitshell >>Makefile <<!GROK!THIS!
+a2p: $(obj) a2p$(OBJ_EXT)
+       $(CC) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs) -o a2p
 
 # I now supply a2p.c with the kits, so the following section is
-# commented out if you don't have byacc.
+# used only if you force byacc to run by saying
+# make  run_byacc
 
-${comment1}a2p.c:      a2p.y
-${comment1}    @ echo Expect many shift/reduce and reduce/reduce conflicts
-${comment1}    \$(BYACC) a2p.y
-${comment1}    mv y.tab.c a2p.c
+run_byacc:     FORCE
+       @ echo Expect many shift/reduce and reduce/reduce conflicts
+       $(BYACC) a2p.y
+       mv y.tab.c a2p.c
 
-# This version is used if you do not have byacc.
-${comment2}a2p.c:      a2p.y
-${comment2}    touch a2p.c
+# 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
 
-!GROK!THIS!
-cat >>Makefile <<'!NO!SUBS!'
-
-a2p.o: a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h handy.h ../config.h str.h hash.h
+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 *.o
+       rm -f a2p *$(OBJ_EXT)
 
 realclean: clean
        rm -f *.orig core $(addedbyconf) all malloc.c
-       rm -f Makefile cflags find2perl s2p makefile makefile.old
+       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
 
 # The following lint has practically everything turned on.  Unfortunately,
 # you have to wade through a lot of mumbo jumbo that can't be suppressed.
@@ -127,7 +131,7 @@ lint:
        lint $(lintflags) $(defs) $(c) > a2p.fuzz
 
 depend: $(mallocsrc) ../makedepend
-       ../makedepend
+       sh ../makedepend
 
 clist:
        echo $(c) | tr ' ' '\012' >.clist
@@ -138,6 +142,11 @@ hlist:
 shlist:
        echo $(sh) | tr ' ' '\012' >.shlist
 
+# These should be automatically generated
+
+$(plextract):
+       ../miniperl -I../lib $@.PL
+
 malloc.c: ../malloc.c
        rm -f malloc.c
        sed <../malloc.c >malloc.c \
@@ -153,7 +162,7 @@ $eunicefix Makefile
 case `pwd` in
 *SH)
     $rm -f ../Makefile
-    ln Makefile ../Makefile
+    $ln Makefile ../Makefile
     ;;
 esac
-rm -f makefile
+rm -f $firstmakefile