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/libpkg | |
parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
download | illumos-joyent-gcc9.tar.gz |
mergegcc9
Diffstat (limited to 'usr/src/lib/libpkg')
-rw-r--r-- | usr/src/lib/libpkg/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libpkg/Makefile.com | 4 | ||||
-rw-r--r-- | usr/src/lib/libpkg/i386/Makefile | 2 | ||||
-rw-r--r-- | usr/src/lib/libpkg/sparc/Makefile | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/usr/src/lib/libpkg/Makefile b/usr/src/lib/libpkg/Makefile index 391b02ac28..e616711396 100644 --- a/usr/src/lib/libpkg/Makefile +++ b/usr/src/lib/libpkg/Makefile @@ -23,19 +23,18 @@ # Use is subject to license terms. # -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) all := TARGET = all install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber _msg := TARGET = _msg -lint := TARGET = lint .KEEP_STATE: -all clean clobber install _msg lint: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libpkg/Makefile.com b/usr/src/lib/libpkg/Makefile.com index 227b3833d8..3776c70241 100644 --- a/usr/src/lib/libpkg/Makefile.com +++ b/usr/src/lib/libpkg/Makefile.com @@ -55,10 +55,9 @@ POFILE = libpkg.po MSGFILES = $(OBJECTS:%.o=../common/%.i) CLEANFILES += $(MSGFILES) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lscf -ladm @@ -83,7 +82,6 @@ $(POFILE): $(MSGFILES) _msg: $(MSGDOMAINPOFILE) -lint: lintcheck # include library targets include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libpkg/i386/Makefile b/usr/src/lib/libpkg/i386/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libpkg/i386/Makefile +++ b/usr/src/lib/libpkg/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libpkg/sparc/Makefile b/usr/src/lib/libpkg/sparc/Makefile index c86be4377c..d19fa69829 100644 --- a/usr/src/lib/libpkg/sparc/Makefile +++ b/usr/src/lib/libpkg/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) |