Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[karo-tx-linux.git] / security / Makefile

diff --git a/security/Makefile b/security/Makefile
index a5918e01a4f71a6e97abc664682bd23f75bc544f..05f1c934d74bda522fb54318b33d1f206d5860ba 100644 (file)
--- a/security/Makefile
+++ b/security/Makefile
@@ -16,14 +16,14 @@ obj-$(CONFIG_MMU)                   += min_addr.o
 # Object file lists
 obj-$(CONFIG_SECURITY)                 += security.o capability.o
 obj-$(CONFIG_SECURITYFS)               += inode.o
-obj-$(CONFIG_SECURITY_SELINUX)         += selinux/built-in.o
-obj-$(CONFIG_SECURITY_SMACK)           += smack/built-in.o
+obj-$(CONFIG_SECURITY_SELINUX)         += selinux/
+obj-$(CONFIG_SECURITY_SMACK)           += smack/
 obj-$(CONFIG_AUDIT)                    += lsm_audit.o
-obj-$(CONFIG_SECURITY_TOMOYO)          += tomoyo/built-in.o
-obj-$(CONFIG_SECURITY_APPARMOR)                += apparmor/built-in.o
-obj-$(CONFIG_SECURITY_YAMA)            += yama/built-in.o
+obj-$(CONFIG_SECURITY_TOMOYO)          += tomoyo/
+obj-$(CONFIG_SECURITY_APPARMOR)                += apparmor/
+obj-$(CONFIG_SECURITY_YAMA)            += yama/
 obj-$(CONFIG_CGROUP_DEVICE)            += device_cgroup.o
 
 # Object integrity file lists
 subdir-$(CONFIG_INTEGRITY)             += integrity
-obj-$(CONFIG_INTEGRITY)                        += integrity/built-in.o
+obj-$(CONFIG_INTEGRITY)                        += integrity/