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/libsmedia/library | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/libsmedia/library')
| -rw-r--r-- | usr/src/lib/libsmedia/library/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libsmedia/library/Makefile.com | 22 | ||||
| -rw-r--r-- | usr/src/lib/libsmedia/library/i386/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/libsmedia/library/sparc/Makefile | 4 |
4 files changed, 6 insertions, 29 deletions
diff --git a/usr/src/lib/libsmedia/library/Makefile b/usr/src/lib/libsmedia/library/Makefile index cf1194b02e..7bb74c58a8 100644 --- a/usr/src/lib/libsmedia/library/Makefile +++ b/usr/src/lib/libsmedia/library/Makefile @@ -34,10 +34,9 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint package := TARGET= package -LIBRARY= libsmedia.a +LIBRARY= libsmedia.a TEXT_DOMAIN= SUNW_OST_OSLIB XGETFLAGS= -a POFILE= $(LIBRARY:.a=.po) @@ -48,7 +47,7 @@ GREP= grep .KEEP_STATE: -all clean delete install lint package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) clobber : $(SUBDIRS) $(RM) $(CLOBBERFILES) diff --git a/usr/src/lib/libsmedia/library/Makefile.com b/usr/src/lib/libsmedia/library/Makefile.com index 4807392165..cdaf3d7624 100644 --- a/usr/src/lib/libsmedia/library/Makefile.com +++ b/usr/src/lib/libsmedia/library/Makefile.com @@ -37,21 +37,12 @@ include ../../../Makefile.lib SRCDIR = ../common -# We can't lint the rpcgen-generated files. -# (Well, we could, but we couldn't fix them.) -lintcheck := SRCS = ../common/l_generic.c ../common/l_misc.c - -LIBS = $(DYNLIB) $(LINTLIB) - -# definitions for lint - -LINTSRC= $(LINTLIB:%.ln=%) -$(LINTLIB):= SRCS = ../common/$(LINTSRC) +LIBS = $(DYNLIB) CLEANFILES += $(DERIVED_FILES:%=../common/%) CPPFLAGS += -D_REENTRANT -I$(SRC)/cmd/smserverd/ -CFLAGS += $(CCVERBOSE) +CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable @@ -62,7 +53,6 @@ LDLIBS += -lnsl -lc all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ @@ -71,14 +61,6 @@ objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -# install rule for lint library target - -$(ROOTLINTDIR64)/%: ../common/% - $(INS.file) - -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) - # # Derived files # diff --git a/usr/src/lib/libsmedia/library/i386/Makefile b/usr/src/lib/libsmedia/library/i386/Makefile index 50cbcb01b9..fdba8b0416 100644 --- a/usr/src/lib/libsmedia/library/i386/Makefile +++ b/usr/src/lib/libsmedia/library/i386/Makefile @@ -22,11 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libsmedia/library/sparc/Makefile b/usr/src/lib/libsmedia/library/sparc/Makefile index 6cfe59363b..fc9f3314e3 100644 --- a/usr/src/lib/libsmedia/library/sparc/Makefile +++ b/usr/src/lib/libsmedia/library/sparc/Makefile @@ -22,12 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) |