---

yaml --- r: 211668 b: refs/heads/master c: 60272da h: refs/heads/master v: v3
git-mirror · Oct 20, 2010 · bc6af23 · bc6af23
1 parent 2e211e7
commit bc6af23
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ceba72a68d17ee36ef24a71b80dde39ee934ece8
+refs/heads/master: 60272da0341e9eaa136e1dc072bfef72c995d851
diff --git a/trunk/security/selinux/Makefile b/trunk/security/selinux/Makefile
@@ -2,17 +2,12 @@
 # Makefile for building the SELinux module as part of the kernel tree.
 #
 
-obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ss/
-
-selinux-y := avc.o \
-	     hooks.o \
-	     selinuxfs.o \
-	     netlink.o \
-	     nlmsgtab.o \
-	     netif.o \
-	     netnode.o \
-	     netport.o \
-	     exports.o
+obj-$(CONFIG_SECURITY_SELINUX) := selinux.o
+
+selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o \
+	     netnode.o netport.o exports.o \
+	     ss/ebitmap.o ss/hashtab.o ss/symtab.o ss/sidtab.o ss/avtab.o \
+	     ss/policydb.o ss/services.o ss/conditional.o ss/mls.o ss/status.o
 
 selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o
 

diff --git a/trunk/security/selinux/ss/Makefile b/trunk/security/selinux/ss/Makefile