diff options
Diffstat (limited to 'usr/src/lib/libkmf')
| -rw-r--r-- | usr/src/lib/libkmf/libkmf/Makefile.com | 7 | ||||
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com | 17 |
2 files changed, 5 insertions, 19 deletions
diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com index e860567e48..86a674c87d 100644 --- a/usr/src/lib/libkmf/libkmf/Makefile.com +++ b/usr/src/lib/libkmf/libkmf/Makefile.com @@ -53,12 +53,11 @@ include $(SRC)/lib/Makefile.rootfs SRCDIR= ../common INCDIR= ../../include -LIBS= $(DYNLIB) $(LINTLIB) - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS= $(DYNLIB) LDLIBS += $(BERDERLIB) $(CRYPTOUTILLIB) -lmd -lpkcs11 -lnsl -lsocket -lc LDLIBS += -lcustr +NATIVE_LIBS += libxml2.so # DYNLIB libraries do not have lint libs and are not linted $(DYNLIB) := LDLIBS += -lxml2 @@ -79,6 +78,4 @@ SMATCH=off all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com index 31867e3d2d..05fe0a1e2a 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com @@ -39,13 +39,7 @@ BERLIB64= $(BERLIB) OPENSSLLIBS= $(BERLIB) -lcrypto -lcryptoutil -lc OPENSSLLIBS64= $(BERLIB64) -lcrypto -lcryptoutil -lc -LINTSSLLIBS = $(BERLIB) -lcrypto -lcryptoutil -lc -LINTSSLLIBS64 = $(BERLIB64) -lcrypto -lcryptoutil -lc - -# Because of varying openssl implementations, we need to not have lint -# complain if we're being liberal in our suppression directives. -LINTFLAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -LINTFLAGS64 += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED +NATIVE_LIBS += libcrypto.so SRCDIR= ../common INCDIR= ../../include @@ -63,10 +57,7 @@ SMATCH=off PICS= $(OBJECTS:%=pics/%) -lint:= OPENSSLLIBS= $(LINTSSLLIBS) -lint:= OPENSSLLIBS64= $(LINTSSLLIBS64) - -LDLIBS32 += $(OPENSSLLIBS) +LDLIBS32 += $(OPENSSLLIBS) ROOTLIBDIR= $(ROOTFS_LIBDIR)/crypto ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) @@ -74,9 +65,7 @@ ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) .KEEP_STATE: LIBS = $(DYNLIB) -all: $(DYNLIB) $(LINTLIB) - -lint: lintcheck +all: $(DYNLIB) FRC: |