add offsets, new fields

[unix-history] / usr / src / usr.bin / ex / Makefile

diff --git a/usr/src/usr.bin/ex/Makefile b/usr/src/usr.bin/ex/Makefile
index fcbfd60..0b0a9d4 100644 (file)
--- a/usr/src/usr.bin/ex/Makefile
+++ b/usr/src/usr.bin/ex/Makefile
@@ -1,4 +1,24 @@
-#      Makefile        7.7     83/07/09
+#
+# Copyright (c) 1980 Regents of the University of California.
+# All rights reserved.  The Berkeley software License Agreement
+# specifies the terms and conditions for redistribution.
+#
+#      @(#)Makefile    7.13.1.1 (Berkeley) %G%
+#
+#
+# Copyright (c) 1980 Regents of the University of California.
+# All rights reserved.  The Berkeley software License Agreement
+# specifies the terms and conditions for redistribution.
+#
+#      @(#)Makefile    7.13.1.1 (Berkeley) %G%
+#
+#
+# Copyright (c) 1980 Regents of the University of California.
+# All rights reserved.  The Berkeley software License Agreement
+# specifies the terms and conditions for redistribution.
+#
+#      @(#)Makefile    7.13.1.1 (Berkeley) %G%
+#

 VERSION=3.7
 #
 # Ex skeletal makefile for VAX VM/Unix 4.2BSD
 VERSION=3.7
 #
 # Ex skeletal makefile for VAX VM/Unix 4.2BSD


@@ -9,8 +29,7 @@ VERSION=3.7
 # software.  Things that can be turned off to save
 # space include LISPCODE (-l flag, showmatch and lisp options), UCVISUAL
 # (visual \ nonsense on upper case only terminals), CHDIR (the undocumented
 # software.  Things that can be turned off to save
 # space include LISPCODE (-l flag, showmatch and lisp options), UCVISUAL
 # (visual \ nonsense on upper case only terminals), CHDIR (the undocumented

-# chdir command.)  CRYPT includes the code to edit encrypted files (the -x
-# option, like ed.)  VMUNIX makes ex considerably larger, raising many limits
+# chdir command.)  VMUNIX makes ex considerably larger, raising many limits

 # and improving speed and simplicity of maintenance.  It is suitable only
 # for a VAX or other large machine, and then probably only in a paged system.
 #
 # and improving speed and simplicity of maintenance.  It is suitable only
 # for a VAX or other large machine, and then probably only in a paged system.
 #


@@ -29,7 +48,7 @@ XSTR= ${BINDIR}/xstr
 DEBUGFLAGS=    -DTRACE -g
 NONDEBUGFLAGS= -O
 DEB=   ${NONDEBUGFLAGS}        # or ${DEBUGFLAGS} to to debug
 DEBUGFLAGS=    -DTRACE -g
 NONDEBUGFLAGS= -O
 DEB=   ${NONDEBUGFLAGS}        # or ${DEBUGFLAGS} to to debug

-OPTIONS= -DCRYPT -DLISPCODE -DCHDIR -DUCVISUAL -DVFORK -DVMUNIX -DSTDIO
+OPTIONS= -DLISPCODE -DCHDIR -DUCVISUAL -DVFORK -DVMUNIX -DFASTTAG

 CFLAGS=        -DTABS=8 ${OPTIONS} ${DEB}
 LDFLAGS=       -z              # or -i or -n
 TERMLIB=       -ltermcap
 CFLAGS=        -DTABS=8 ${OPTIONS} ${DEB}
 LDFLAGS=       -z              # or -i or -n
 TERMLIB=       -ltermcap


@@ -39,14 +58,14 @@ INCLUDE=/usr/include
 PR=    pr
 OBJS=  ex.o ex_addr.o ex_cmds.o ex_cmds2.o ex_cmdsub.o \
        ex_data.o ex_extern.o ex_get.o ex_io.o ex_put.o ex_re.o \
 PR=    pr
 OBJS=  ex.o ex_addr.o ex_cmds.o ex_cmds2.o ex_cmdsub.o \
        ex_data.o ex_extern.o ex_get.o ex_io.o ex_put.o ex_re.o \

-       ex_set.o ex_subr.o ex_temp.o ex_tty.o ex_unix.o \
+       ex_set.o ex_subr.o ex_tagio.o ex_temp.o ex_tty.o ex_unix.o \

        ex_v.o ex_vadj.o ex_vget.o ex_vmain.o ex_voper.o \
        ex_vops.o ex_vops2.o ex_vops3.o ex_vput.o ex_vwind.o \
        printf.o bcopy.o strings.o
 HDRS=  ex.h ex_argv.h ex_re.h ex_temp.h ex_tty.h ex_tune.h ex_vars.h ex_vis.h
 SRC1=  ex.c ex_addr.c ex_cmds.c ex_cmds2.c ex_cmdsub.c
 SRC2=  ex_data.c ex_get.c ex_io.c ex_put.c ex_re.c
        ex_v.o ex_vadj.o ex_vget.o ex_vmain.o ex_voper.o \
        ex_vops.o ex_vops2.o ex_vops3.o ex_vput.o ex_vwind.o \
        printf.o bcopy.o strings.o
 HDRS=  ex.h ex_argv.h ex_re.h ex_temp.h ex_tty.h ex_tune.h ex_vars.h ex_vis.h
 SRC1=  ex.c ex_addr.c ex_cmds.c ex_cmds2.c ex_cmdsub.c
 SRC2=  ex_data.c ex_get.c ex_io.c ex_put.c ex_re.c

-SRC3=  ex_set.c ex_subr.c ex_temp.c ex_tty.c ex_unix.c
+SRC3=  ex_set.c ex_subr.c ex_tagio.c ex_temp.c ex_tty.c ex_unix.c

 SRC4=  ex_v.c ex_vadj.c ex_vget.c ex_vmain.c ex_voper.c
 SRC5=  ex_vops.c ex_vops2.c ex_vops3.c ex_vput.c ex_vwind.c
 SRC6=  printf.c bcopy.c expreserve.c exrecover.c
 SRC4=  ex_v.c ex_vadj.c ex_vget.c ex_vmain.c ex_voper.c
 SRC5=  ex_vops.c ex_vops2.c ex_vops3.c ex_vput.c ex_vwind.c
 SRC6=  printf.c bcopy.c expreserve.c exrecover.c


@@ -68,15 +87,16 @@ VHDR=       "Ex Version ${VERSION}"
 all:   a.out exrecover expreserve
 
 a.out: ${OBJS}
 all:   a.out exrecover expreserve
 
 a.out: ${OBJS}

-       ${CC} ${LDFLAGS} ${OBJS} ${TERMLIB}
+       @echo loading a.out
+       @${CC} ${LDFLAGS} ${OBJS} ${TERMLIB}

 
 tags:  /tmp
        ${CTAGS} -w ex.[hc] ex_*.[hc]
 
 ${OBJS}: ${HDRS}
 
 
 tags:  /tmp
        ${CTAGS} -w ex.[hc] ex_*.[hc]
 
 ${OBJS}: ${HDRS}
 

-# ex_vars.h:
-#      csh makeoptions ${CFLAGS}
+ex_vars.h:
+       csh makeoptions ${CFLAGS}

 
 bcopy.o:       bcopy.c
        ${CC} -c ${CFLAGS} bcopy.c
 
 bcopy.o:       bcopy.c
        ${CC} -c ${CFLAGS} bcopy.c


@@ -131,8 +151,8 @@ install: a.out exrecover expreserve
        ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/view
        ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/usr/bin/ex
        chmod 1755 ${DESTDIR}/${BINDIR}/ex
        ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/view
        ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/usr/bin/ex
        chmod 1755 ${DESTDIR}/${BINDIR}/ex

-       install -m 4755 exrecover ${DESTDIR}/${LIBDIR}/ex${VERSION}recover
-       install -m 4755 expreserve ${DESTDIR}/${LIBDIR}/ex${VERSION}preserve
+       install -s -o root -m 4755 exrecover ${DESTDIR}/${LIBDIR}/ex${VERSION}recover
+       install -s -o root -m 4755 expreserve ${DESTDIR}/${LIBDIR}/ex${VERSION}preserve

 # The following line normally fails.  This is OK.
        -mkdir ${DESTDIR}/usr/preserve
 
 # The following line normally fails.  This is OK.
        -mkdir ${DESTDIR}/usr/preserve