Rename templates to match names in makefiles/Makefile.* and include/port.

Read templates after compiler is detected. Convert all templates to real
shell scripts. Rename bsd->openbsd, alpha->osf.

src/template/.similar

@@ -1,34 +0,0 @@
-# Format of this file is expr-style-regular-expression=templatefilename
-alpha[a-z0-9]*-unknown-linux-gnu=linux_alpha
-alpha[a-z0-9]*-dec-osf=alpha_cc
-arm-unknown-linux-gnu=linux_arm
-hppa[0-9.]*-hp-hpux=hpux_cc
-hppa1.1-stratus-sysv4=svr4
-i.86-next-nextstep3=nextstep
-i.86-pc-bsdi2.0=bsdi_2.0
-i.86-pc-bsdi2.1=bsdi_2.1
-i.86-pc-bsdi3=bsdi_2.1
-i.86-pc-bsdi4=bsdi_4.0
-i.86-pc-cygwin=cygwin32
-i.86-pc-linux-gnu=linux_i386
-i.86-pc-sco3.2v=sco
-i.86-pc-solaris=solaris_i386_gcc
-i.86-pc-sunos5=solaris_i386_gcc
-i.86-unknown-freebsd=freebsd
-i.86-unknown-netbsd=netbsd
-m68k-unknown-linux=linux_m68k
-mips-pc-linux-gnu=linux_mips
-mips-sgi-irix=irix5
-mipsel-unknown-linux-gnu=linux_mips
-powerpc-ibm-aix3.2.5=aix_325
-powerpc-ibm-aix4.1=aix_41
-powerpc-ibm-aix4.2=aix_42
-powerpc-ibm-aix4.3=aix_42
-powerpc-unknown-linux-gnu=linux_ppc
-rs6000-ibm-aix4.2=aix_42
-rs6000-ibm-aix4.3=aix_42
-sparc-sun-solaris=solaris_sparc_gcc
-sparc-sun-sunos4=sunos4_gcc
-sparc-sun-sunos5=solaris_sparc_gcc
-sparc-unknown-bsdi4=bsdi_4.0_sparc
-sparc-unknown-linux-gnu=linux_sparc

src/template/aix

@@ -0,0 +1,23 @@
+AROPT=crs
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+  CFLAGS=-pipe
+  CXXFLAGS=-pipe
+  SHARED_LIB=-lc
+else # not GCC
+  case $host_os in
+    aix3.2.5)
+      CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg'
+      SHARED_LIB='-e _nostart -lc'
+      ;;
+    aix4.1)
+      CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero'
+      SHARED_LIB='-bnoentry -lc'
+      ;;
+    aix4.2 | aix4.3)
+      CFLAGS='-qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong'
+      SHARED_LIB='-lc'
+      ;;
+  esac
+fi # not GCC

src/template/aix_325

@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg
-SHARED_LIB:-e _nostart -lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:xlc

src/template/aix_41

@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero
-SHARED_LIB:-bnoentry -lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:xlc

src/template/aix_42

@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong
-SHARED_LIB:-lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:xlc

src/template/aix_gcc

@@ -1,9 +0,0 @@
-AROPT:crs
-CFLAGS:-pipe
-CXXFLAGS:-pipe
-SHARED_LIB:-lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:gcc

src/template/alpha_gcc

@@ -1,14 +0,0 @@
-AROPT:crs
-# NOFIXADE disallows unaligned access.
-#   on Ultrix and OSF/1 it invokes an explicit syscall.
-#   on HP-UX it turns off certain compiler options.
-# This is defined here because a bunch of clients include tmp/c.h,
-# which is where the work is done on HP-UX.  It only affects the
-# backend on Ultrix and OSF/1.
-CC:gcc
-CFLAGS:-D__alpha__ -DNOFIXADE
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/bsdi

@@ -0,0 +1,22 @@
+AROPT=cq
+CFLAGS='-O2 -pipe'
+
+case $host_cpu in
+  i?86)  CFLAGS="$CFLAGS -m486";;
+esac
+
+case $host_os in
+  bsdi2.0) CFLAGS="$CFLAGS -DPRE_BSDI_2_1";;
+esac
+
+case $host_os in
+  bsdi2.0 | bsdi2.1 | bsdi3)
+    SHARED_LIB=
+    DLSUFFIX=.o
+    CC=gcc2
+    ;;
+  bsdi4)
+    SHARED_LIB=-fpic
+    DLSUFFIX=.so
+    ;;
+esac

src/template/bsdi_2.0

@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -m486 -pipe -DPRE_BSDI_2_1
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.o
-CC:gcc2

src/template/bsdi_2.1

@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -m486 -pipe
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.o
-CC:gcc2

src/template/bsdi_4.0

@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -m486 -pipe
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:gcc

src/template/bsdi_4.0_sparc

@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -pipe
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:gcc

src/template/cygwin32

@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:
-ALL:
-SRCH_INC:/usr/local/include
-SRCH_LIB:/usr/local/lib
-DLSUFFIX:.dll
-LIBS:-lcygipc

src/template/dgux

@@ -1,8 +1,4 @@
-AROPT:crs
-CFLAGS:
-LIBS:-lsocket -lnsl
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=
+SHARED_LIB=-fpic
+DLSUFFIX=.so

src/template/freebsd

@@ -1,6 +1,4 @@
-AROPT:cq
-SHARED_LIB:-fpic -DPIC
-CFLAGS:-O2 -m486 -pipe
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=cq
+SHARED_LIB='-fpic -DPIC'
+CFLAGS='-O2 -m486 -pipe'
+DLSUFFIX=.so

src/template/generic

@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/hpux

@@ -0,0 +1,14 @@
+AROPT=crs
+DLSUFFIX=.sl
+
+if test "$GCC" = yes ; then
+  CFLAGS=-O2
+  SHARED_LIB=-fPIC
+  DL_LIB=/usr/lib/libdld.sl
+  CCC=g++
+else
+  CFLAGS='-Wl,-E -Ae'
+  SHARED_LIB=+z
+  CPP='cc -E -Ae'
+  CCC=aCC
+fi

src/template/hpux_cc

@@ -1,11 +0,0 @@
-AROPT:crs
-CFLAGS:-Wl,-E -Ae 
-SHARED_LIB:+z
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.sl
-CC:cc
-CPP:cc -E -Ae
-# Make aCC be first C++ compiler name tried...
-CCC:aCC

src/template/hpux_gcc

@@ -1,10 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DL_LIB:/usr/lib/libdld.sl
-DLSUFFIX:.sl
-CC:gcc
-CCC:g++

src/template/irix5

@@ -1,7 +1,4 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=
+SHARED_LIB=
+DLSUFFIX=.so

src/template/linux

@@ -0,0 +1,9 @@
+AROPT=crs
+CFLAGS=-O2
+SHARED_LIB=-fpic
+DLSUFFIX=.so
+
+case $host_cpu in
+  mips*)   CFLAGS="$CFLAGS -mips2";;
+  alpha*)  CPU=alpha;;
+esac

src/template/linux_alpha

@@ -1,9 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CPU:alpha
-

src/template/linux_arm

@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/linux_i386

@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/linux_m68k

@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/linux_mips

@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2 -mips2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/linux_ppc

@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/linux_sparc

@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/netbsd

@@ -1,6 +1,4 @@
-AROPT:cq
-SHARED_LIB:-fpic -DPIC
-CFLAGS:-O2 -pipe
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=cq
+SHARED_LIB='-fpic -DPIC'
+CFLAGS='-O2 -pipe'
+DLSUFFIX=.so

src/template/nextstep

@@ -1,7 +1,4 @@
-AROPT:rc
-CFLAGS:
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.o
+AROPT=rc
+CFLAGS=
+SHARED_LIB=
+DLSUFFIX=.o

src/template/openbsd

@@ -1,6 +1,4 @@
-AROPT:cq
-SHARED_LIB:-fpic -DPIC
-CFLAGS:-O2 -pipe
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=cq
+SHARED_LIB='-fpic -DPIC'
+CFLAGS='-O2 -pipe'
+DLSUFFIX=.so

src/template/osf

@@ -1,17 +1,21 @@
-AROPT:crs
+AROPT=crs
+
 # NOFIXADE disallows unaligned access.
 #   on Ultrix and OSF/1 it invokes an explicit syscall.
 #   on HP-UX it turns off certain compiler options.
 # This is defined here because a bunch of clients include tmp/c.h,
 # which is where the work is done on HP-UX.  It only affects the
 # backend on Ultrix and OSF/1.
-CC:cc
-CFLAGS:-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000
-LDFLAGS='-rpath $(LIBDIR)'
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CCC:cxx
-CXXFLAGS:-D__alpha__ -DNOFIXADE -O4 -Olimit 2000
+
+if test "$GCC" = yes ; then
+  CFLAGS='-D__alpha__ -DNOFIXADE'
+  CCC=g++
+else
+  CFLAGS='-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000'
+  LDFLAGS='-rpath $(libdir)'
+  CCC=cxx
+  CXXFLAGS='-D__alpha__ -DNOFIXADE -O4 -Olimit 2000'
+fi
+
+DLSUFFIX=.so
+SHARED_LIB=

src/template/qnx

@@ -1,9 +0,0 @@
-AROPT:cr
-CFLAGS:
-LIBS:-lunix
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CXXFLAGS:-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++

src/template/qnx4

@@ -0,0 +1,6 @@
+AROPT=cr
+CFLAGS=
+LIBS=-lunix
+SHARED_LIB=
+DLSUFFIX=.so
+CXXFLAGS=-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++

src/template/sco

@@ -1,8 +1,5 @@
-AROPT:cq
-CFLAGS:
-SHARED_LIB:-K PIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc -b elf
+AROPT=cq
+CFLAGS=
+SHARED_LIB='-K PIC'
+DLSUFFIX=.so
+CC="$CC -b elf"

src/template/solaris_i386

@@ -0,0 +1,11 @@
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+  AROPT=crs
+  CFLAGS=
+  SHARED_LIB=-fPIC
+else
+  AROPT=cq
+  CFLAGS=
+  SHARED_LIB=-KPIC
+fi

src/template/solaris_i386_cc

@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:
-SHARED_LIB:-KPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc

src/template/solaris_i386_gcc

@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/solaris_sparc

@@ -0,0 +1,10 @@
+AROPT=crs
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+  CFLAGS=
+  SHARED_LIB=-fPIC
+else
+  CFLAGS='-Xa -v -D__sparc__ -D__sun__'
+  SHARED_LIB=-KPIC
+fi

src/template/solaris_sparc_cc

@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-Xa -v -D__sparc__ -D__sun__
-SHARED_LIB:-KPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc

src/template/solaris_sparc_gcc

@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/sunos4

@@ -0,0 +1,10 @@
+AROPT=cr
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+  CFLAGS=
+  SHARED_LIB=-fPIC
+else
+  CFLAGS=
+  SHARED_LIB=-PIC
+fi

src/template/sunos4_cc

@@ -1,8 +0,0 @@
-AROPT:cr
-CFLAGS:
-SHARED_LIB:-PIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc

src/template/sunos4_gcc

@@ -1,7 +0,0 @@
-AROPT:cr
-CFLAGS:
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so

src/template/svr4

@@ -1,7 +1,4 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:
-ALL:+W0
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=
+SHARED_LIB=
+DLSUFFIX=.so

src/template/ultrix4

@@ -1,7 +1,4 @@
-AROPT:crs
-CFLAGS:-DNOFIXADE
-SHARED_LIB:-G 0
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=-DNOFIXADE
+SHARED_LIB='-G 0'
+DLSUFFIX=.so

src/template/univel

@@ -1,8 +1,5 @@
-AROPT:crs
-CFLAGS:-v -O -K i486,host,inline,loop_unroll -Dsvr4
-SHARED_LIB:-K PIC
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc
-LIBS:-lc89 
+AROPT=crs
+CFLAGS='-v -O -K i486,host,inline,loop_unroll -Dsvr4'
+SHARED_LIB='-K PIC'
+DLSUFFIX=.so
+LIBS=-lc89 

src/template/unixware

@@ -1,7 +1,6 @@
-AROPT:crs
-CFLAGS:-O -K i486,host,inline,loop_unroll,alloca -Dsvr4
-SHARED_LIB:-K PIC
-SRCH_INC:/opt/include
-SRCH_LIB:/opt/lib
-DLSUFFIX:.so
-CC:cc
+AROPT=crs
+CFLAGS='-O -K i486,host,inline,loop_unroll,alloca -Dsvr4'
+SHARED_LIB='-K PIC'
+SRCH_INC='/opt/include'
+SRCH_LIB='/opt/lib'
+DLSUFFIX=.so

src/template/win

@@ -0,0 +1,6 @@
+AROPT=crs
+CFLAGS=-O2
+SRCH_INC=/usr/local/include
+SRCH_LIB=/usr/local/lib
+DLSUFFIX=.dll
+LIBS=-lcygipc