diff options
author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
---|---|---|
committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/lib/libmail | |
parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
download | illumos-joyent-gcc9.tar.gz |
mergegcc9
Diffstat (limited to 'usr/src/lib/libmail')
-rw-r--r-- | usr/src/lib/libmail/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libmail/Makefile.com | 21 | ||||
-rw-r--r-- | usr/src/lib/libmail/i386/Makefile | 2 | ||||
-rw-r--r-- | usr/src/lib/libmail/sparc/Makefile | 2 |
4 files changed, 7 insertions, 23 deletions
diff --git a/usr/src/lib/libmail/Makefile b/usr/src/lib/libmail/Makefile index cc83d1296c..b1f249b754 100644 --- a/usr/src/lib/libmail/Makefile +++ b/usr/src/lib/libmail/Makefile @@ -34,11 +34,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg package := TARGET= package -LIBRARY= libmail.a +LIBRARY= libmail.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -48,7 +47,7 @@ SED= sed .KEEP_STATE: -all clean clobber install lint package: $(SUBDIRS) +all clean clobber install package: $(SUBDIRS) # definitions for install_h target HDRS= maillock.h libmail.h s_string.h diff --git a/usr/src/lib/libmail/Makefile.com b/usr/src/lib/libmail/Makefile.com index 4c384da5c2..5358c12bf8 100644 --- a/usr/src/lib/libmail/Makefile.com +++ b/usr/src/lib/libmail/Makefile.com @@ -22,16 +22,14 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libmail.a VERS= .1 -OBJECTS= abspath.o casncmp.o copystream.o delempty.o \ +OBJECTS= abspath.o casncmp.o copystream.o delempty.o \ getdomain.o maillock.o notifyu.o popenvp.o \ s_string.o setup_exec.o strmove.o skipspace.o \ - substr.o systemvp.o trimnl.o xgetenv.o + substr.o systemvp.o trimnl.o xgetenv.o include ../../Makefile.lib @@ -39,11 +37,7 @@ SRCDIR = ../common MAPFILES += $(MAPFILE32) -LIBS = $(DYNLIB) $(LINTLIB) - -$(LINTLIB):= SRCS = ../common/llib-lmail - -LINTSRC= $(LINTLIB:%.ln=%) +LIBS = $(DYNLIB) CPPFLAGS = -I../inc -I../../common/inc $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) @@ -53,7 +47,6 @@ LDLIBS += -lc all: $(LIBS) -lint: lintcheck include ../../Makefile.targ @@ -62,11 +55,3 @@ pics/%.o: ../common/%.c $(POST_PROCESS_O) pics/%.o: ../inc/%.h - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) - -# install rule for 64 bit lint library target -$(ROOTLINTDIR64)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libmail/i386/Makefile b/usr/src/lib/libmail/i386/Makefile index b2ea017616..fe215697a5 100644 --- a/usr/src/lib/libmail/i386/Makefile +++ b/usr/src/lib/libmail/i386/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libmail/sparc/Makefile b/usr/src/lib/libmail/sparc/Makefile index b2ea017616..fe215697a5 100644 --- a/usr/src/lib/libmail/sparc/Makefile +++ b/usr/src/lib/libmail/sparc/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) |