From bc6af23f68380317f60e3056ed9ba20dcdf19761 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Wed, 15 Sep 2010 20:14:53 -0400 Subject: [PATCH] --- yaml --- r: 211668 b: refs/heads/master c: 60272da0341e9eaa136e1dc072bfef72c995d851 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/Makefile | 17 ++++++----------- trunk/security/selinux/ss/Makefile | 9 --------- 3 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 trunk/security/selinux/ss/Makefile diff --git a/[refs] b/[refs] index 338d0a9d349c..cd4e45395203 100644 --- 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 index c6fa30e2d673..a30f218c33ee 100644 --- 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 deleted file mode 100644 index 974e11c7cf54..000000000000 --- a/trunk/security/selinux/ss/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# Makefile for building the SELinux security server as part of the kernel tree. -# - -EXTRA_CFLAGS += -Isecurity/selinux -Isecurity/selinux/include -obj-y := ss.o - -ss-y := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o conditional.o mls.o status.o -