Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0c2de2b authored by Sam Ravnborg's avatar Sam Ravnborg Committed by James Morris
Browse files

security: cleanup Makefiles to use standard syntax for specifying sub-directories 



The Makefiles in security/ uses a non-standard way to
specify sub-directories for building.

Fix it up so the normal (and documented) approach is used.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent e0238b4c

security/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ obj-$(CONFIG_MMU) += min_addr.o 
# Object file lists

obj-$(CONFIG_SECURITY)			+= security.o capability.o

obj-$(CONFIG_SECURITYFS)		+= inode.o

obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/built-in.o

obj-$(CONFIG_SECURITY_SMACK)		+= smack/built-in.o

obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/

obj-$(CONFIG_SECURITY_SMACK)		+= smack/

obj-$(CONFIG_AUDIT)			+= lsm_audit.o

obj-$(CONFIG_SECURITY_TOMOYO)		+= tomoyo/built-in.o

obj-$(CONFIG_SECURITY_APPARMOR)		+= apparmor/built-in.o

obj-$(CONFIG_SECURITY_YAMA)		+= yama/built-in.o

obj-$(CONFIG_SECURITY_TOMOYO)		+= tomoyo/

obj-$(CONFIG_SECURITY_APPARMOR)		+= apparmor/

obj-$(CONFIG_SECURITY_YAMA)		+= yama/

obj-$(CONFIG_CGROUP_DEVICE)		+= device_cgroup.o



# Object integrity file lists

subdir-$(CONFIG_INTEGRITY)		+= integrity

obj-$(CONFIG_INTEGRITY)			+= integrity/built-in.o
 
obj-$(CONFIG_INTEGRITY)			+= integrity/

security/integrity/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -10,6 +10,6 @@ obj-$(CONFIG_INTEGRITY_ASYMMETRIC_KEYS) += digsig_asymmetric.o 
integrity-y := iint.o



subdir-$(CONFIG_IMA)			+= ima

obj-$(CONFIG_IMA)			+= ima/built-in.o

obj-$(CONFIG_IMA)			+= ima/

subdir-$(CONFIG_EVM)			+= evm

obj-$(CONFIG_EVM)			+= evm/built-in.o
 
obj-$(CONFIG_EVM)			+= evm/