diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 20:40:47 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 20:40:47 +0200 |
| commit | a04fd1aa4f807e2f97632a46070306e1389264ed (patch) | |
| tree | fc2511add6defbbcb3f5285ef78fd0c34ccc5512 /crypto/userspace/Makefile | |
| parent | 16ace6317db2c47b36b08b0addfe91356151c08d (diff) | |
| parent | 935be4945512eb37461a226c51ede5e8b05cbe24 (diff) | |
| download | kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.tar.gz kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.tar.xz kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.zip | |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
crypto/userspace/ncr-data.c
crypto/userspace/ncr_int.h
examples/Makefile
examples/ncr.c
examples/pk.c
examples/speed.c
ncr-int.h
ncr_int.h
Diffstat (limited to 'crypto/userspace/Makefile')
| -rw-r--r-- | crypto/userspace/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/userspace/Makefile b/crypto/userspace/Makefile index 0b031d4b533..41c82c42e6a 100644 --- a/crypto/userspace/Makefile +++ b/crypto/userspace/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-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 |