X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=security%2FMakefile;h=da20a193c8dd6623d834ef9bb1396fcaacfd9bd0;hb=734b4157b367d66405f7dab80085d17c9c8dd3b5;hp=c05c127fff9a795d9b3c21d7c1a510c6b7a5a4cc;hpb=da31894ed7b654e2e1741e7ac4ef6c15be0dd14b;p=safe%2Fjmp%2Flinux-2.6

diff --git a/security/Makefile b/security/Makefile
index c05c127..da20a19 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -5,9 +5,11 @@
 obj-$(CONFIG_KEYS)			+= keys/
 subdir-$(CONFIG_SECURITY_SELINUX)	+= selinux
 subdir-$(CONFIG_SECURITY_SMACK)		+= smack
+subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo
 
 # always enable default capabilities
-obj-y		+= commoncap.o
+obj-y					+= commoncap.o
+obj-$(CONFIG_MMU)			+= min_addr.o
 
 # Object file lists
 obj-$(CONFIG_SECURITY)			+= security.o capability.o
@@ -15,5 +17,10 @@ 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_SMACK)		+= smack/built-in.o
-obj-$(CONFIG_SECURITY_ROOTPLUG)		+= root_plug.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