From 707ae74fc7aae4f9aaef480c11289b69356bbe51 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Sat, 24 Jul 2010 03:31:39 +0200 Subject: Allow parrallel build (make -j$$$$N) Using "$(MAKE)" instead of "make" allows make to recognize the subprocesses and manage the parallel build. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0b031d4..04f4984 100644 --- a/Makefile +++ b/Makefile @@ -75,22 +75,22 @@ cryptodev-objs = cryptodev_main.o cryptodev_cipher.o ncr.o \ obj-m += cryptodev.o build: - @make version.h - make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules + @$(MAKE) version.h + $(MAKE) -C $(KERNEL_DIR) SUBDIRS=`pwd` modules install: - make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install + $(MAKE) -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install @echo "Installing cryptodev.h in /usr/include/crypto ..." @install -D cryptodev.h /usr/include/crypto/cryptodev.h @install -D ncr.h /usr/include/crypto/ncr.h clean: - make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean + $(MAKE) -C $(KERNEL_DIR) SUBDIRS=`pwd` clean rm -f $(hostprogs) - KERNEL_DIR=$(KERNEL_DIR) make -C examples clean + KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C examples clean check: - KERNEL_DIR=$(KERNEL_DIR) make -C examples check + KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C examples check FILEBASE = cryptodev-linux-$(VERSION) TMPDIR ?= /tmp -- cgit From a9970bd8d7b690f03e770a16d8471924ea3ad126 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sun, 25 Jul 2010 20:48:26 +0200 Subject: Separated the direct session functions. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 04f4984..2babafd 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ TOMCRYPT_OBJECTS = libtomcrypt/misc/zeromem.o libtomcrypt/misc/crypt/crypt_argch cryptodev-objs = cryptodev_main.o cryptodev_cipher.o ncr.o \ ncr-data.o ncr-key.o ncr-limits.o ncr-sessions.o ncr-pk.o \ + ncr-sessions-direct.o \ ncr-key-wrap.o ncr-key-storage.o $(TOMMATH_OBJECTS) \ $(TOMCRYPT_OBJECTS) -- cgit From 6a2560330da7bc05ccb9bc75e70ce745acba7d6c Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sun, 25 Jul 2010 22:17:22 +0200 Subject: No need for ncr-direct. All session operations are being done on keys or on userspace data. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2babafd..f85e7bd 100644 --- a/Makefile +++ b/Makefile @@ -67,8 +67,8 @@ TOMCRYPT_OBJECTS = libtomcrypt/misc/zeromem.o libtomcrypt/misc/crypt/crypt_argch libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.o cryptodev-objs = cryptodev_main.o cryptodev_cipher.o ncr.o \ - ncr-data.o ncr-key.o ncr-limits.o ncr-sessions.o ncr-pk.o \ - ncr-sessions-direct.o \ + ncr-data.o ncr-key.o ncr-limits.o ncr-pk.o \ + ncr-sessions-direct.o ncr-sessions.o \ ncr-key-wrap.o ncr-key-storage.o $(TOMMATH_OBJECTS) \ $(TOMCRYPT_OBJECTS) -- cgit From f84ea240b18ce93ae26030ce28d19af4bc9962a1 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 26 Jul 2010 00:19:45 +0200 Subject: removed the data type. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f85e7bd..3b7ebf6 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ TOMCRYPT_OBJECTS = libtomcrypt/misc/zeromem.o libtomcrypt/misc/crypt/crypt_argch libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.o cryptodev-objs = cryptodev_main.o cryptodev_cipher.o ncr.o \ - ncr-data.o ncr-key.o ncr-limits.o ncr-pk.o \ + ncr-key.o ncr-limits.o ncr-pk.o \ ncr-sessions-direct.o ncr-sessions.o \ ncr-key-wrap.o ncr-key-storage.o $(TOMMATH_OBJECTS) \ $(TOMCRYPT_OBJECTS) -- cgit From bd29b1337fab4bb0ca41ff83271482bfe551d38b Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 26 Jul 2010 01:29:04 +0200 Subject: Corrected issue when finalizing sessions that hashed keys. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3b7ebf6..41c82c4 100644 --- a/Makefile +++ b/Makefile @@ -67,8 +67,7 @@ TOMCRYPT_OBJECTS = libtomcrypt/misc/zeromem.o libtomcrypt/misc/crypt/crypt_argch libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.o cryptodev-objs = cryptodev_main.o cryptodev_cipher.o ncr.o \ - ncr-key.o ncr-limits.o ncr-pk.o \ - ncr-sessions-direct.o ncr-sessions.o \ + ncr-key.o ncr-limits.o ncr-pk.o ncr-sessions.o \ ncr-key-wrap.o ncr-key-storage.o $(TOMMATH_OBJECTS) \ $(TOMCRYPT_OBJECTS) -- cgit