summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-04-05 13:18:55 (GMT)
committerGitHub <noreply@github.com>2017-04-05 13:18:55 (GMT)
commit4da54c8953a8a31a339902229da69d50d379e3cd (patch)
tree879bd73dfa36cca2cc91b664064f0ae5aeae1e4d
parentefb85f1a73686f95bd53374d90b11a0b23c347a8 (diff)
parentd0aa402fe63865615b280110d2d889f5cee9b54b (diff)
downloadmxe-4da54c8953a8a31a339902229da69d50d379e3cd.zip
mxe-4da54c8953a8a31a339902229da69d50d379e3cd.tar.gz
mxe-4da54c8953a8a31a339902229da69d50d379e3cd.tar.bz2
Merge pull request #1740 from tonytheodore/local-pkg
Makefile: explicitly set .DEFAULT_GOAL for LOCAL_PKG_LIST
-rw-r--r--Makefile7
-rw-r--r--docs/index.html2
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9c26d65..a255c6e 100644
--- a/Makefile
+++ b/Makefile
@@ -326,11 +326,16 @@ else
echo '# The three lines below makes `make` build these "local'; \
echo '# packages" instead of all packages.'; \
echo '#LOCAL_PKG_LIST := boost curl file flac lzo pthreads vorbis wxwidgets'; \
- echo '#.DEFAULT local-pkg-list:'; \
+ echo '#.DEFAULT_GOAL := local-pkg-list'; \
echo '#local-pkg-list: $$(LOCAL_PKG_LIST)'; \
} >'$(PWD)/settings.mk')
endif
+ifneq ($(LOCAL_PKG_LIST),)
+ .DEFAULT_GOAL := local-pkg-list
+ $(info [pkg-list] $(LOCAL_PKG_LIST))
+endif
+
# Numeric min and max list functions
LIST_NMAX = $(shell echo '$(strip $(1))' | tr ' ' '\n' | sort -n | tail -1)
LIST_NMIN = $(shell echo '$(strip $(1))' | tr ' ' '\n' | sort -n | head -1)
diff --git a/docs/index.html b/docs/index.html
index 23e8800..3d48bac 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -934,7 +934,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
the package list can also be set in
<code>settings.mk</code>
<pre>LOCAL_PKG_LIST := foo bar
-.DEFAULT local-pkg-list:
+.DEFAULT_GOAL := local-pkg-list
local-pkg-list: $(LOCAL_PKG_LIST)</pre>
</dd>
<dd>