diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 19:08:44 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 19:08:44 +0200 |
| commit | afed807b11199877214ec2e5d81e96c230237759 (patch) | |
| tree | 8b01ef8a6f881656d78e4f54b60a9ea41187a175 /Makefile | |
| parent | d750b60952619af570ac4d91cd650ffa6bbe311d (diff) | |
| parent | 935be4945512eb37461a226c51ede5e8b05cbe24 (diff) | |
Merge branch 'master' into algorithm-speedup
Conflicts:
libtomcrypt/pk/pkcs1/pkcs_1_pss_decode.c
libtomcrypt/pk/pkcs1/pkcs_1_pss_encode.c
libtomcrypt/pk/rsa/rsa_decrypt_key.c
libtomcrypt/pk/rsa/rsa_encrypt_key.c
libtomcrypt/pk/rsa/rsa_sign_hash.c
libtomcrypt/pk/rsa/rsa_verify_hash.c
ncr-int.h
ncr-key.c
ncr-pk.c
ncr-sessions.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -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-sessions.o ncr-pk.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) @@ -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 |