summaryrefslogtreecommitdiff
path: root/usr/src/lib/pkcs11/pkcs11_softtoken
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2020-05-26 13:57:13 +0000
committerJohn Levon <john.levon@joyent.com>2020-05-26 13:57:13 +0000
commit5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch)
tree7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/lib/pkcs11/pkcs11_softtoken
parent8ca018083101bf1cb175869679bc123187fb1bab (diff)
parent2a1277d3064386cd5c4e372301007aa330bf1d5e (diff)
downloadillumos-joyent-gcc9.tar.gz
mergegcc9
Diffstat (limited to 'usr/src/lib/pkcs11/pkcs11_softtoken')
-rw-r--r--usr/src/lib/pkcs11/pkcs11_softtoken/Makefile5
-rw-r--r--usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com8
2 files changed, 1 insertions, 12 deletions
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile
index cdeea1697a..bd158b1cf2 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/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 check clean clobber install lint: $(SUBDIRS)
+all check clean clobber install: $(SUBDIRS)
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
index a837802e81..a3d76fd04e 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
@@ -124,7 +124,6 @@ LIBS = $(DYNLIB)
LDLIBS += -lc -lmd -lcryptoutil -lsoftcrypto -lgen
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
CFLAGS += $(CCVERBOSE)
@@ -145,21 +144,14 @@ CPPFLAGS += -I$(AESDIR) -I$(BLOWFISHDIR) -I$(ARCFOURDIR) -I$(DESDIR) \
-I$(BIGNUMDIR) -I$(PADDIR) -D_POSIX_PTHREAD_SEMANTICS \
-DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B
-LINTFLAGS64 += -errchk=longptr64
ROOTLIBDIR= $(ROOT)/usr/lib/security
ROOTLIBDIR64= $(ROOT)/usr/lib/security/$(MACH64)
-LINTSRC = \
- $(LCL_OBJECTS:%.o=$(SRCDIR)/%.c) \
- $(RNG_COBJECTS:%.o=$(RNGDIR)/%.c)
-
.KEEP_STATE:
all: $(LIBS)
-lint: $$(LINTSRC)
- $(LINT.c) $(LINTCHECKFLAGS) $(LINTSRC) $(LDLIBS)
pics/%.o: $(BERDIR)/%.c
$(COMPILE.c) -o $@ $< -D_SOLARIS_SDK -I$(BERDIR) \