summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-05-10 21:09:15 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-05-10 21:09:15 (GMT)
commitd632bcd7cbe1a0e9ee416fb56a4b3f8b7e0ae585 (patch)
tree9e51faf7706040edf2fb02bac6a59efb351d177f /Makefile
parent726e91d6e3ef51c82a037a7e1e6839e0de9f8cd2 (diff)
downloadmxe-d632bcd7cbe1a0e9ee416fb56a4b3f8b7e0ae585.zip
mxe-d632bcd7cbe1a0e9ee416fb56a4b3f8b7e0ae585.tar.gz
mxe-d632bcd7cbe1a0e9ee416fb56a4b3f8b7e0ae585.tar.bz2
Use set_is_member from GMSL for $(PKGS)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index dfca349..6413788 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,8 @@ LOG_DIR := $(PWD)/log
TIMESTAMP := $(shell date +%Y%m%d_%H%M%S)
PKG_DIR := $(PWD)/pkg
TMP_DIR = $(PWD)/tmp-$(1)
-PKGS := $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html')
+PKGS := $(call set_create,\
+ $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html'))
BUILD := $(shell '$(EXT_DIR)/config.guess')
PATH := $(PREFIX)/$(BUILD)/bin:$(PREFIX)/bin:$(PATH)
@@ -466,12 +467,12 @@ update:
$(foreach PKG,$(PKGS),$(call UPDATE,$(PKG),$(shell $($(PKG)_UPDATE))))
update-package-%:
- $(if $(findstring $*~,$(addsuffix ~,$(PKGS))), \
+ $(if $(call set_is_member,$*,$(PKGS)), \
$(call UPDATE,$*,$(shell $($*_UPDATE))), \
$(error package $* not found in index.html))
update-checksum-%:
- $(if $(findstring $*~,$(addsuffix ~,$(PKGS))), \
+ $(if $(call set_is_member,$*,$(PKGS)), \
$(call DOWNLOAD_PKG_ARCHIVE,$*) && \
$(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$(TOP_DIR)/src/$*.mk', \
$(error package $* not found in index.html))