put source file popen.c back in, sigh. Needs to execute /bin/csh to work on

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

diff --git a/usr/src/usr.bin/mail/Makefile b/usr/src/usr.bin/mail/Makefile
index 0790665..7550eee 100644 (file)
--- a/usr/src/usr.bin/mail/Makefile
+++ b/usr/src/usr.bin/mail/Makefile
@@ -1,29 +1,33 @@
 #
 # Unix version 7.
 #
 #
 # Unix version 7.
 #

-# Sccs Id = "@(#)Makefile      2.2 %G%";
+# Sccs Id = "@(#)Makefile      2.5 %G%";

 #
 
 CFLAGS=-O -DVMUNIX -DV7
 XSTR=/usr/ucb/xstr
 DESTDIR=/usr/src
 CTAGS=/usr/ucb/ctags -w
 #
 
 CFLAGS=-O -DVMUNIX -DV7
 XSTR=/usr/ucb/xstr
 DESTDIR=/usr/src
 CTAGS=/usr/ucb/ctags -w

-VPRINT=/usr/ucb/vprint
+VPRINT=/usr/ucb/print

 CGRAF=/ja/rigel/rigel/bin/cgraf
 CGRAF=/ja/rigel/rigel/bin/cgraf

+CGRAPH=/ja/rigel/rigel/bin/cgraph
+NMKINDEX=/ja/rigel/rigel/bin/nmkindex
+DIRTCLOD=/ja/rigel/rigel/bin/dirtclod

 LIBES=-ljobs
 ED=-ed
 AS=-as
 RM=-rm
 LIBES=-ljobs
 ED=-ed
 AS=-as
 RM=-rm

-OBJS=aux.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o edit.o fio.o \
-       getname.o head.o v7.local.o lock.o optim.o names.o lex.o list.o main.o \
-       quit.o send.o strings.o temp.o tty.o vars.o version.o \
-       errlst.o str.o npopen.o
+OBJS=aux.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o config.o edit.o fio.o \
+       getname.o head.o v7.local.o lock.o lex.o list.o main.o \
+       names.o optim.o popen.o quit.o send.o strings.o temp.o tty.o \
+       vars.o version.o errlst.o str.o

 
 

-SRCS=aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \
-       getname.c head.c v7.local.c lock.c optim.c names.c lex.c list.c main.c \
-       quit.c send.c strings.c temp.c tty.c vars.c errlst.c
+SRCS=aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c config.c edit.c fio.c \
+       getname.c head.c v7.local.c lock.c lex.c list.c main.c \
+       names.c optim.c popen.c quit.c send.c strings.c temp.c tty.c vars.c \
+       errlst.c version.c

 
 

-HDRS=rcv.h def.h glob.h v7.local.h local.h
+HDRS=rcv.h configdefs.h def.h glob.h v7.local.h local.h

 
 S = $(SRCS) $(HDRS)
 
 
 S = $(SRCS) $(HDRS)
 


@@ -50,7 +54,7 @@ install:
        cd ${DESTDIR}/usr/ucb; rm -f mail; ln Mail mail
 
 $S:
        cd ${DESTDIR}/usr/ucb; rm -f mail; ln Mail mail
 
 $S:

-       sccs get $@
+       sccs get $@;

 
 srcs:  $S
 
 
 srcs:  $S
 


@@ -61,7 +65,6 @@ clean:
        $(RM) -f *.o
        rm -f Mail a.out fmt x.c xs.c tags core
        cp /dev/null strings
        $(RM) -f *.o
        rm -f Mail a.out fmt x.c xs.c tags core
        cp /dev/null strings

-       cp /dev/null version.c

 
 lint:
        lint $(CFLAGS) $(SRCS)
 
 lint:
        lint $(CFLAGS) $(SRCS)


@@ -77,6 +80,9 @@ str.o: strings
        mv xs.o str.o
        $(RM) xs.c
 
        mv xs.o str.o
        $(RM) xs.c
 

+config.o:      config.c
+       $(CC) -R -c config.c
+

 cmdtab.o: cmdtab.c
        $(CC) -R -c $(CFLAGS) cmdtab.c
 
 cmdtab.o: cmdtab.c
        $(CC) -R -c $(CFLAGS) cmdtab.c
 


@@ -85,14 +91,12 @@ errlst.o: errlst.c
        ${CC} ${CFLAGS} -R -c x.c
        mv x.o errlst.o
 
        ${CC} ${CFLAGS} -R -c x.c
        mv x.o errlst.o
 

-#
-# Make the version file.  /tmp is always changing.
-#
-version.c: #   /tmp
-       /bin/sh version > version.c
-
-print:
-       @$(VPRINT) makefile rcv.h def.h glob.h local.h v7.local.h $(SRCS) fmt.c;
+print: $S fmt.c
+       $(CGRAPH) > mail.g;
+       $(NMKINDEX) > mail.i;
+       $(DIRTCLOD) -x mail.i -p mail.g > mail.x
+       @$(VPRINT) makefile mail.x rcv.h def.h glob.h local.h v7.local.h \
+           $(SRCS) fmt.c;

 
 wc:
        @wc rcv.h def.h glob.h local.h v7.local.h $(SRCS)
 
 wc:
        @wc rcv.h def.h glob.h local.h v7.local.h $(SRCS)