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

diff --git a/security/Makefile b/security/Makefile
index 8cbbf2f..f654260 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -4,16 +4,15 @@
 
 obj-$(CONFIG_KEYS)			+= keys/
 subdir-$(CONFIG_SECURITY_SELINUX)	+= selinux
+subdir-$(CONFIG_SECURITY_SMACK)		+= smack
 
-# if we don't select a security model, use the default capabilities
-ifneq ($(CONFIG_SECURITY),y)
+# always enable default capabilities
 obj-y		+= commoncap.o
-endif
 
 # Object file lists
-obj-$(CONFIG_SECURITY)			+= security.o dummy.o inode.o
+obj-$(CONFIG_SECURITY)			+= security.o capability.o 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_SECURITY_ROOTPLUG)		+= root_plug.o
+obj-$(CONFIG_CGROUP_DEVICE)		+= device_cgroup.o