diff options
Diffstat (limited to 'usr/src/cmd/mail/Makefile')
| -rw-r--r-- | usr/src/cmd/mail/Makefile | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/usr/src/cmd/mail/Makefile b/usr/src/cmd/mail/Makefile index 45487bfcee..c55889cba4 100644 --- a/usr/src/cmd/mail/Makefile +++ b/usr/src/cmd/mail/Makefile @@ -27,23 +27,21 @@ BINPROG= mail -PROG= $(BINPROG) - -GREP= grep +PROG= $(BINPROG) include ../Makefile.cmd CLOBBERFILES= $(PROG) CLEANFILES= $(MAILOBJS) -MAILOBJS= add_recip.o cat.o ckdlivopts.o \ +MAILOBJS= add_recip.o cat.o ckdlivopts.o \ cksaved.o clr_hinfo.o copyback.o copylet.o \ - copymt.o createmf.o del_recipl.o Dout.o delete.o \ + copymt.o createmf.o del_recipl.o Dout.o delete.o \ done.o doopen.o dumpaff.o dumprcv.o \ errmsg.o gendeliv.o getarg.o getcomment.o \ gethead.o goback.o init.o \ isheader.o isit.o islocal.o istext.o legal.o \ - lock.o main.o mkdead.o mta_ercode.o \ + lock.o main.o mkdead.o mta_ercode.o \ new_recipl.o parse.o pckaffspot.o pckrcvspot.o \ pickFrom.o pipletr.o poplist.o printhdr.o printmail.o \ pushlist.o savehdrs.o sel_disp.o sendlist.o \ @@ -53,7 +51,7 @@ MAILOBJS= add_recip.o cat.o ckdlivopts.o \ MAILSRC= $(MAILOBJS:%.o=%.c) CPROG= mail -CPROGSRC= $(CPROG:%=_%.c) +CPROGSRC= $(CPROG:%=_%.c) # ROOT directories ROOTMAILD= $(ROOTLIB)/mail @@ -66,7 +64,7 @@ ROOTSYMLINKS= $(ROOTBIN)/rmail EDITPATH= \ - sed -e 's!REAL_PATH!/usr/bin!g' \ + $(SED) -e 's!REAL_PATH!/usr/bin!g' \ -e 's!USR_SHARE_LIB!/usr/share/lib!g' \ -e 's!VAR_MAIL!/var/mail!g' < $? > $@ @@ -83,7 +81,7 @@ SMATCH = off LDLIBS += -lmail -lsocket # mail defines its own delete() - reduce symbols to locals to remove name clash. -LDFLAGS += $(MAPFILE.NGB:%=-M%) +LDFLAGS += $(MAPFILE.NGB:%=-Wl,-M%) # conditional assignments # @@ -91,12 +89,9 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint # file modes, owners and groups for the install target # - - $(ROOTBIN)/mail := FILEMODE = 02511 @@ -110,7 +105,7 @@ $(ROOTINC)/% : % all: $(PROG) -mail: $(MAILOBJS) +mail: $(MAILOBJS) $(LINK.c) -o $@ $(MAILOBJS) $(LDLIBS) $(POST_PROCESS) @@ -121,9 +116,6 @@ install: all .WAIT $(ROOTBINPROG) $(ROOTSYMLINKS) $(ROOTBIN)/rmail: $(RM) $@; $(SYMLINK) mail $@ -lint: - $(LINT.c) $(MAILSRC) - clean: $(RM) $(OBJS) $(MAILOBJS) |