summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2010-08-09 17:34:25 -0400
committerJames Morris <jmorris@namei.org>2010-10-21 10:12:38 +1100
commitceba72a68d17ee36ef24a71b80dde39ee934ece8 (patch)
tree912582b629745d650e9f8ae6fecb42e4345e3900 /security
parent119041672592d1890d89dd8f194bd0919d801dc8 (diff)
downloadlinux-3.10-ceba72a68d17ee36ef24a71b80dde39ee934ece8.tar.gz
linux-3.10-ceba72a68d17ee36ef24a71b80dde39ee934ece8.tar.bz2
linux-3.10-ceba72a68d17ee36ef24a71b80dde39ee934ece8.zip
selinux: fix parallel compile error
Selinux has an autogenerated file, "flask.h" which is included by two other selinux files. The current makefile has a single dependency on the first object file in the selinux-y list, assuming that will get flask.h generated before anyone looks for it, but that assumption breaks down in a "make -jN" situation and you get: selinux/selinuxfs.c:35: fatal error: flask.h: No such file or directory compilation terminated. remake[9]: *** [security/selinux/selinuxfs.o] Error 1 Since flask.h is included by security.h which in turn is included nearly everywhere, make the dependency apply to all of the selinux-y list of objs. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/Makefile b/security/selinux/Makefile
index 58d80f3bd6f..c6fa30e2d67 100644
--- a/security/selinux/Makefile
+++ b/security/selinux/Makefile
@@ -20,7 +20,7 @@ selinux-$(CONFIG_NETLABEL) += netlabel.o
EXTRA_CFLAGS += -Isecurity/selinux -Isecurity/selinux/include
-$(obj)/avc.o: $(obj)/flask.h
+$(addprefix $(obj)/,$(selinux-y)): $(obj)/flask.h
quiet_cmd_flask = GEN $(obj)/flask.h $(obj)/av_permissions.h
cmd_flask = scripts/selinux/genheaders/genheaders $(obj)/flask.h $(obj)/av_permissions.h