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/libdscp | |
parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
download | illumos-joyent-gcc9.tar.gz |
mergegcc9
Diffstat (limited to 'usr/src/lib/libdscp')
-rw-r--r-- | usr/src/lib/libdscp/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libdscp/Makefile.com | 4 | ||||
-rw-r--r-- | usr/src/lib/libdscp/sparc/Makefile | 2 | ||||
-rw-r--r-- | usr/src/lib/libdscp/svc/Makefile | 6 |
4 files changed, 4 insertions, 13 deletions
diff --git a/usr/src/lib/libdscp/Makefile b/usr/src/lib/libdscp/Makefile index ed1d5b934e..56b99b9cba 100644 --- a/usr/src/lib/libdscp/Makefile +++ b/usr/src/lib/libdscp/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -33,7 +31,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint # definitions for install_h target HDRS= libdscp.h @@ -43,7 +40,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) # install rule for install_h target diff --git a/usr/src/lib/libdscp/Makefile.com b/usr/src/lib/libdscp/Makefile.com index f480c1ece2..6b50138cd6 100644 --- a/usr/src/lib/libdscp/Makefile.com +++ b/usr/src/lib/libdscp/Makefile.com @@ -31,9 +31,8 @@ OBJECTS= libdscp.o include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lsocket -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CPPFLAGS += -I.. CFLAGS += $(CCVERBOSE) @@ -55,6 +54,5 @@ all: $(LIBS) install: all .WAIT $(ROOTLIBDIR) $(ROOTLIB) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libdscp/sparc/Makefile b/usr/src/lib/libdscp/sparc/Makefile index 182e6180d4..5c4980a2bd 100644 --- a/usr/src/lib/libdscp/sparc/Makefile +++ b/usr/src/lib/libdscp/sparc/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com diff --git a/usr/src/lib/libdscp/svc/Makefile b/usr/src/lib/libdscp/svc/Makefile index 8e995fa692..90a9a6065e 100644 --- a/usr/src/lib/libdscp/svc/Makefile +++ b/usr/src/lib/libdscp/svc/Makefile @@ -22,10 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# lib/libdscp/svc/Makefile.com -# -#ident "%Z%%M% %I% %E% SMI" -# MANIFEST= dscp.xml SVCMETHOD= svc-dscp @@ -48,7 +44,7 @@ $(ROOTOPTIONSDIR): $(ROOTOPTIONSDIR)/%: % $(INS.file) -all clean clobber lint: +all clean clobber: install: $(ROOTMANIFEST) $(ROOTSVCMETHOD) $(ROOTOPTIONS) |