diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-05 11:32:50 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-05 11:32:50 +0000 |
| commit | e28caa620b96c1b08f8b4ca6a99cb350839dfd02 (patch) | |
| tree | 5f0fde1b66a4900f5f8f141b710bc850f092d9be /usr/src/lib/libgrubmgmt | |
| parent | a59b194a7b40a08dc3d3ffe01f7781acd43ae60f (diff) | |
| parent | 3052595ab8ddcc51231d239415b5eba5d913d45b (diff) | |
| download | illumos-joyent-e28caa620b96c1b08f8b4ca6a99cb350839dfd02.tar.gz | |
[illumos-gate merge]
commit 3052595ab8ddcc51231d239415b5eba5d913d45b
11807 "private use area" characters should be marked as "printable"
commit cd61ae21816e53b94bc1673f3f1aa651fc3115e8
12447 should install library compat symlinks from library makefiles, not Targetdirs
commit 241c90a06e8d1708235651863df515a2d522a03a
12454 remove lint library machinery
commit 282d4a2d330d797757f16d55e1df9569f3e52d10
12666 libproc manpage bugs
commit d906f494f9407f1ae043a922478ce3609959caf5
12670 Unaligned output of snoop's usage() function
commit 18c4eaf123da22eddbe6e9a4ba7b8115ba748075
12669 Add omitted word in vmstat man page
commit b68ab351091d2aea3f72a011f64de12fb05fc833
12028 zfs test mdb_001_pos can fail
Conflicts:
usr/src/lib/nsswitch/dns/Makefile.com
usr/src/lib/libsff/Makefile
usr/src/lib/brand/Makefile
usr/src/lib/Makefile.lib
usr/src/lib/Makefile.targ
Diffstat (limited to 'usr/src/lib/libgrubmgmt')
| -rw-r--r-- | usr/src/lib/libgrubmgmt/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libgrubmgmt/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/libgrubmgmt/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libgrubmgmt/sparc/Makefile | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/usr/src/lib/libgrubmgmt/Makefile b/usr/src/lib/libgrubmgmt/Makefile index 5a147360bd..55705ea512 100644 --- a/usr/src/lib/libgrubmgmt/Makefile +++ b/usr/src/lib/libgrubmgmt/Makefile @@ -34,16 +34,15 @@ POFILES = common/libgrub_errno.po SUBDIRS = $(MACH) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint test := TARGET= test .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libgrubmgmt/Makefile.com b/usr/src/lib/libgrubmgmt/Makefile.com index ef1da17922..74fd51a797 100644 --- a/usr/src/lib/libgrubmgmt/Makefile.com +++ b/usr/src/lib/libgrubmgmt/Makefile.com @@ -33,13 +33,12 @@ OBJECTS += libgrub_menu.o libgrub_bargs.o libgrub_errno.o include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common INCS += -I$(SRCDIR) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) # # Libraries added to the next line must be present in miniroot # @@ -51,6 +50,5 @@ CFLAGS += $(CCVERBOSE) all: $(LIBS) -lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/libgrubmgmt/i386/Makefile b/usr/src/lib/libgrubmgmt/i386/Makefile index 9b91a98d13..8697c2f834 100644 --- a/usr/src/lib/libgrubmgmt/i386/Makefile +++ b/usr/src/lib/libgrubmgmt/i386/Makefile @@ -32,4 +32,4 @@ include ../Makefile.com # LDLIBS += -lfdisk -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libgrubmgmt/sparc/Makefile b/usr/src/lib/libgrubmgmt/sparc/Makefile index 0ef5233f44..47878e05bc 100644 --- a/usr/src/lib/libgrubmgmt/sparc/Makefile +++ b/usr/src/lib/libgrubmgmt/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) |