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/libgrubmgmt | |
parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
download | illumos-joyent-gcc9.tar.gz |
mergegcc9
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) |