aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-15 23:42:33 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-15 23:42:33 +0000
commit2dd29010ee78262edf94feb6bd3c58f62171deb3 (patch)
treeeef401e3e490a6515a137cec46ab572e10b7ee37
parent96ac2c8ae5aff6bf4fd1c10e52e5511ea3b5d9cc (diff)
Make the menuselect instructions correct by allowing 'make menuselect' to actually solve dependency problems.
(Previously, it would fail out again with the same message about running 'make menuselect', which was NOT at all helpful.) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@246709 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a71d7820a..7d403dbdb 100644
--- a/Makefile
+++ b/Makefile
@@ -323,8 +323,10 @@ makeopts: configure
@exit 1
menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+ifeq ($(filter %menuselect,$(MAKECMDGOALS)),)
menuselect/menuselect --check-deps $@
menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+endif
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
+@echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules