summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Luebbe <jlu@pengutronix.de>2013-10-14 17:39:25 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-10-15 08:36:53 +0200
commit0a45810d2928d9a9233f86bd977a1e8fa59975e5 (patch)
tree873dfde07b5fa42d77f46f3480e0aebfe8ec6db8
parent8f23a17f9bac836e4a2f4883ca8f886f535449a8 (diff)
downloadbarebox-0a45810d2928d9a9233f86bd977a1e8fa59975e5.tar.gz
barebox-0a45810d2928d9a9233f86bd977a1e8fa59975e5.tar.xz
common: fix possible build problem without password support
In the case where CONFIG_PASSWORD is off, CONFIG_PASSWORD_DEFAULT is undefined. As undefined is not "", this causes make to call find -type f. If there is a filename containing a :, make will complain about having "multiple target patterns" Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile
index 75d924e90f..6f6e360647 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -116,6 +116,7 @@ $(obj)/barebox_default_env.h: $(obj)/barebox_default_env$(barebox_default_env_co
$(call if_changed,env_h)
quiet_cmd_pwd_h = PWDH $@
+ifdef CONFIG_PASSWORD
ifneq ($(CONFIG_PASSWORD_DEFAULT),"")
PASSWD_FILE := $(shell cd $(srctree); find $(CONFIG_PASSWORD_DEFAULT) -type f)
cmd_pwd_h = echo -n "const char default_passwd[] = \"" > $@; \
@@ -134,6 +135,7 @@ endif
targets += include/generated/passwd.h
$(obj)/password.o: include/generated/passwd.h
+endif
# dependencies on generated files need to be listed explicitly
$(obj)/version.o: include/generated/compile.h