summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-04-25 23:25:55 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2014-04-25 23:25:55 (GMT)
commitd7d566adf464f9acfe2311faa26f529f231c68a6 (patch)
treed46fdf0bfee5413c38aab2631cd5b97736e10237
parent30687b4d18bb7a6297f325858ba4c2cc7f62c3d5 (diff)
downloadnetsurf-all-d7d566adf464f9acfe2311faa26f529f231c68a6.tar.gz
netsurf-all-d7d566adf464f9acfe2311faa26f529f231c68a6.tar.bz2
build nsgenbind without TARGET so it uses host
-rw-r--r--Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ecb46b9..cd9881a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,10 @@ TMP_PREFIX := $(CURDIR)/inst-$(TARGET)
NETSURF_TARG := netsurf
-NSLIBTARG := buildsystem libwapcaplet libparserutils libcss libhubbub libdom libnsbmp libnsgif librosprite libnsfb libsvgtiny nsgenbind
+# nsgenbind host tool
+NSGENBIND_TARG := nsgenbind
+
+NSLIB_TARG := buildsystem libwapcaplet libparserutils libcss libhubbub libdom libnsbmp libnsgif librosprite libnsfb libsvgtiny
# clean macro for each sub target
define do_clean
@@ -33,7 +36,9 @@ build: $(TMP_PREFIX)/build-stamp
$(TMP_PREFIX)/build-stamp:
mkdir -p $(TMP_PREFIX)/include
mkdir -p $(TMP_PREFIX)/lib
- $(foreach L,$(NSLIBTARG),$(call do_prefix_install,$(L)))
+ mkdir -p $(TMP_PREFIX)/bin
+ $(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L)))
+ $(MAKE) --directory=$(NSGENBIND_TARG) PREFIX=$(TMP_PREFIX)
$(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET)
touch $@
@@ -42,10 +47,10 @@ install: $(TMP_PREFIX)/build-stamp
clean:
$(RM) -r $(TMP_PREFIX)
- $(foreach L,$(NSLIBTARG),$(call do_clean,$(L)))
+ $(foreach L,$(NSLIB_TARG),$(call do_clean,$(L)))
$(MAKE) clean --directory=$(NETSURF_TARG) TARGET=$(TARGET)
-release-checkout: $(NSLIBTARG) $(NETSURF_TARG)
+release-checkout: $(NSLIB_TARG) $(NETSURF_TARG) $(NSGENBIND_TARG)
for x in $^; do cd $$x; (git checkout origin/HEAD && git checkout $$(git describe --abbrev=0 --match="release/*" )); cd ..; done
dist: