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/pkcs11/pkcs11_kernel | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/pkcs11/pkcs11_kernel')
| -rw-r--r-- | usr/src/lib/pkcs11/pkcs11_kernel/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com | 27 |
2 files changed, 10 insertions, 22 deletions
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile index ead030d990..91baa42c2b 100644 --- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile +++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -35,11 +33,10 @@ check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com index 9cf7027144..5c55be29d5 100644 --- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com +++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com @@ -28,15 +28,15 @@ LIBRARY= pkcs11_kernel.a VERS= .1 CORE_OBJECTS= \ - kernelGeneral.o \ - kernelSlottable.o \ - kernelSlotToken.o \ - kernelObject.o \ - kernelDigest.o \ - kernelSign.o \ - kernelVerify.o \ - kernelDualCrypt.o \ - kernelKeys.o \ + kernelGeneral.o \ + kernelSlottable.o \ + kernelSlotToken.o \ + kernelObject.o \ + kernelDigest.o \ + kernelSign.o \ + kernelVerify.o \ + kernelDualCrypt.o \ + kernelKeys.o \ kernelRand.o \ kernelSession.o \ kernelSessionUtil.o \ @@ -99,15 +99,6 @@ ROOTLIBDIR64= $(ROOT)/usr/lib/security/$(MACH64) all: $(LIBS) -# we don't need to lint ST_OBJECTS since they are linted elsewhere. -lintcheck := SRCS = $(CORESRCS) -lintother := OSRCS = ../common/kernelSoftCommon.c -lintother := CPPFLAGS = -I$(ST_DIR) $(CPPFLAGS.master) - -lintother: $$(OSRCS) - $(LINT.c) $(LINTCHECKFLAGS) $(OSRCS) $(LDLIBS) - -lint: lintcheck lintother pics/%.o: $(ST_DIR)/%.c $(COMPILE.c) -o $@ $< -I$(ST_DIR) |