diff options
| author | John Johansen <john.johansen@canonical.com> | 2010-07-29 14:48:08 -0700 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-08-02 15:38:34 +1000 |
| commit | f9ad1af53d5232a89a1ff1827102843999975dfa (patch) | |
| tree | 2d7f4c35208b74995651fa6eb47031a37f928503 /security/Makefile | |
| parent | c1c124e91e7c6d5a600c98f6fb5b443c403a14f4 (diff) | |
| download | linux-3.10-f9ad1af53d5232a89a1ff1827102843999975dfa.tar.gz linux-3.10-f9ad1af53d5232a89a1ff1827102843999975dfa.tar.bz2 linux-3.10-f9ad1af53d5232a89a1ff1827102843999975dfa.zip | |
AppArmor: Enable configuring and building of the AppArmor security module
Kconfig and Makefiles to enable configuration and building of AppArmor.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/Makefile')
| -rw-r--r-- | security/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/Makefile b/security/Makefile index da20a193c8d..8bb0fe9e1ca 100644 --- a/security/Makefile +++ b/security/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_KEYS) += keys/ subdir-$(CONFIG_SECURITY_SELINUX) += selinux subdir-$(CONFIG_SECURITY_SMACK) += smack subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo +subdir-$(CONFIG_SECURITY_APPARMOR) += apparmor # always enable default capabilities obj-y += commoncap.o @@ -19,6 +20,7 @@ obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o obj-$(CONFIG_AUDIT) += lsm_audit.o obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o +obj-$(CONFIG_SECURITY_APPARMOR) += apparmor/built-in.o obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o # Object integrity file lists |