diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-01-18 18:38:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-18 18:38:31 -0800 |
| commit | bef7d80318c3ba9ca78384c8463b0fd236b55a1c (patch) | |
| tree | e10e050de24f5647a94e0ec152e2a3770ad6ba56 /security | |
| parent | 605303cc340d482ef0ae7b4e3301733ab9e5de5d (diff) | |
| download | history-bef7d80318c3ba9ca78384c8463b0fd236b55a1c.tar.gz | |
[PATCH] selinux: Makefile cleanup
From: Stephen Smalley <sds@epoch.ncsc.mil>
Use obj-$(CONFIG_FOO) instead of `ifeq'.
Diffstat (limited to 'security')
| -rw-r--r-- | security/Makefile | 4 | ||||
| -rw-r--r-- | security/selinux/Makefile | 6 | ||||
| -rw-r--r-- | security/selinux/ss/Makefile | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/security/Makefile b/security/Makefile index c488ce38a5ef2d..d156d81adba732 100644 --- a/security/Makefile +++ b/security/Makefile @@ -12,8 +12,6 @@ endif # Object file lists obj-$(CONFIG_SECURITY) += security.o dummy.o # Must precede capability.o in order to stack properly. -ifeq ($(CONFIG_SECURITY_SELINUX),y) - obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o -endif +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 diff --git a/security/selinux/Makefile b/security/selinux/Makefile index 0549aed196afc1..8862dea31ef410 100644 --- a/security/selinux/Makefile +++ b/security/selinux/Makefile @@ -4,11 +4,9 @@ obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ss/ -selinux-objs := avc.o hooks.o selinuxfs.o +selinux-y := avc.o hooks.o selinuxfs.o -ifeq ($(CONFIG_SECURITY_NETWORK),y) - selinux-objs += netif.o -endif +selinux-$(CONFIG_SECURITY_NETWORK) += netif.o EXTRA_CFLAGS += -Isecurity/selinux/include diff --git a/security/selinux/ss/Makefile b/security/selinux/ss/Makefile index fa138960bd5011..10085193c341d8 100644 --- a/security/selinux/ss/Makefile +++ b/security/selinux/ss/Makefile @@ -5,9 +5,7 @@ EXTRA_CFLAGS += -Isecurity/selinux/include obj-y := ss.o -ss-objs := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o +ss-y := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o -ifeq ($(CONFIG_SECURITY_SELINUX_MLS),y) -ss-objs += mls.o -endif +ss-$(CONFIG_SECURITY_SELINUX_MLS) += mls.o |