diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-25 00:52:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-25 00:52:30 -0700 |
| commit | efdddf70cc1946feb4b00b1771cce3aef8efcc0e (patch) | |
| tree | ec80678dad8c5c215caf93fbdfc7c175972a9c7f /security/Makefile | |
| parent | ecf2c2143f0865f447020144b2ee6e4181f65814 (diff) | |
| parent | 9d9682d81c14ef82d5fa566b2ebfa047c01c0fc1 (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/lsm-2.5
Diffstat (limited to 'security/Makefile')
| -rw-r--r-- | security/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/security/Makefile b/security/Makefile index 9349c307504d..50a295118b2b 100644 --- a/security/Makefile +++ b/security/Makefile @@ -3,11 +3,15 @@ # # Objects that export symbols -export-objs := security.o +export-objs := security.o capability.o -# Object file lists -obj-y := security.o dummy.o +# if we don't select a security model, use the default capabilities +ifneq ($(CONFIG_SECURITY),y) +obj-y += capability.o +endif +# Object file lists +obj-$(CONFIG_SECURITY) += security.o dummy.o obj-$(CONFIG_SECURITY_CAPABILITIES) += capability.o include $(TOPDIR)/Rules.make |