X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=security%2FMakefile;h=bb44e350c6181bac5e366ee2108d62f27754556d;hb=d5aa3856fd09ad0ea04619d6cba31192dac08e84;hp=8cbbf2f3670987d47e823b11b27be3b487735698;hpb=b67dbf9d4c1987c370fd18fdc4cf9d8aaea604c2;p=safe%2Fjmp%2Flinux-2.6

diff --git a/security/Makefile b/security/Makefile
index 8cbbf2f..bb44e35 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -4,16 +4,22 @@
 
 obj-$(CONFIG_KEYS)			+= keys/
 subdir-$(CONFIG_SECURITY_SELINUX)	+= selinux
+subdir-$(CONFIG_SECURITY_SMACK)		+= smack
+subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo
 
-# if we don't select a security model, use the default capabilities
-ifneq ($(CONFIG_SECURITY),y)
-obj-y		+= commoncap.o
-endif
+# always enable default capabilities
+obj-y		+= commoncap.o min_addr.o
 
 # Object file lists
-obj-$(CONFIG_SECURITY)			+= security.o dummy.o inode.o
+obj-$(CONFIG_SECURITY)			+= security.o capability.o
+obj-$(CONFIG_SECURITYFS)		+= inode.o
 # Must precede capability.o in order to stack properly.
 obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/built-in.o
-obj-$(CONFIG_SECURITY_CAPABILITIES)	+= commoncap.o capability.o
-obj-$(CONFIG_SECURITY_ROOTPLUG)		+= commoncap.o root_plug.o
-obj-$(CONFIG_SECURITY_SECLVL)		+= seclvl.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_CGROUP_DEVICE)		+= device_cgroup.o
+
+# Object integrity file lists
+subdir-$(CONFIG_IMA)			+= integrity/ima
+obj-$(CONFIG_IMA)			+= integrity/ima/built-in.o