diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-23 20:28:32 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-23 20:28:32 +0200 |
| commit | b3fcd1e159bf7bd5b318d4558198fca090deb2fe (patch) | |
| tree | d1821ce0be2ede05bc3417bcba2ace0e2002e250 /Makefile | |
| parent | c3eeccf6491c632037dfef737f3e40ed24e5bf72 (diff) | |
| parent | a3fe06856efe0a7b4ad713ff73a14f6af995d07e (diff) | |
| download | cryptodev-linux-integration.tar.gz cryptodev-linux-integration.tar.xz cryptodev-linux-integration.zip | |
Merge branch 'userspace' into integrationintegration
Conflicts:
examples/Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -77,6 +77,8 @@ obj-m += cryptodev.o build: @$(MAKE) version.h $(MAKE) -C $(KERNEL_DIR) SUBDIRS=`pwd` modules + $(MAKE) -C userspace + $(MAKE) -C examples install: $(MAKE) -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install @@ -86,6 +88,7 @@ install: clean: $(MAKE) -C $(KERNEL_DIR) SUBDIRS=`pwd` clean rm -f $(hostprogs) + $(MAKE) -C userspace clean KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C examples clean check: |