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/libprtdiag_psr/sparc/desktop | |
parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
download | illumos-joyent-gcc9.tar.gz |
mergegcc9
Diffstat (limited to 'usr/src/lib/libprtdiag_psr/sparc/desktop')
-rw-r--r-- | usr/src/lib/libprtdiag_psr/sparc/desktop/Makefile | 6 | ||||
-rw-r--r-- | usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile | 16 | ||||
-rw-r--r-- | usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile | 1 |
3 files changed, 8 insertions, 15 deletions
diff --git a/usr/src/lib/libprtdiag_psr/sparc/desktop/Makefile b/usr/src/lib/libprtdiag_psr/sparc/desktop/Makefile index 713cc7d570..29763cd3d0 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/desktop/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/desktop/Makefile @@ -23,14 +23,10 @@ # Copyright (c) 2000 by Sun Microsystems, Inc. # All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/libprtdiag_psr/sparc/desktop/Makefile PRTDIAG_DIRS= nonpicl picl all := TARGET= all -lint := TARGET= lint clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install @@ -38,7 +34,7 @@ _msg := TARGET= _msg .KEEP_STATE: -all lint clean clobber install _msg : $(PRTDIAG_DIRS) +all clean clobber install _msg: $(PRTDIAG_DIRS) $(PRTDIAG_DIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile index b447b1ba00..4fda9aa997 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile @@ -37,21 +37,19 @@ include $(SRC)/lib/libprtdiag_psr/sparc/Makefile.com SRCS= $(OBJECTS:%.o=../common/%.c) IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../../libprtdiag/inc -LINTFLAGS += $(IFLAGS) # -# desktop platform library should install into -# SUNW,Ultra-2. All other desktop platforms can -# link to /usr/platform/SUNW,Ultra-2/lib/libprtdiag_psr.so +# desktop platform library should install into SUNW,Ultra-2. All other desktop +# platforms can link to /usr/platform/SUNW,Ultra-2/lib/libprtdiag_psr.so # PLATFORM=SUNW,Ultra-2 # -# For all other sun4u platforms NOT delivered by ON (ie. delivered -# by SME or external hardware vendors) we add a default library in -# /usr/platform/sun4u/lib so that prtdiag will default to using -# the desktop library for any of these platforms. (this will be a -# link to ../../SUNW,Ultra-2/lib +# For all other sun4u platforms NOT delivered by ON (ie. delivered by SME or +# external hardware vendors) we add a default library in +# /usr/platform/sun4u/lib so that prtdiag will default to using the desktop +# library for any of these platforms. (this will be a link to +# ../../SUNW,Ultra-2/lib # DEF_PLATFORM=sun4u USR_DEF_PSM_LIB_DIR=$(USR_PLAT_DIR)/$(DEF_PLATFORM)/lib diff --git a/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile index e9c653d7d7..9767ab9336 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile @@ -41,7 +41,6 @@ LDLIBS += -lpicl IFLAGS += -I$(USR_PLAT_DIR)/sun4u/include -I ../../../../libprtdiag/inc IFLAGS += -I$(SRC)/cmd/picl/plugins/inc -LINTFLAGS += $(IFLAGS) # # links in /usr/platform |