Gitweb links: ...log http://git.netsurf-browser.org/netsurf-all.git/shortlog/3c80f49dc4e5da4e3... ...commit http://git.netsurf-browser.org/netsurf-all.git/commit/3c80f49dc4e5da4e32f... ...tree http://git.netsurf-browser.org/netsurf-all.git/tree/3c80f49dc4e5da4e32feb... The branch, master has been updated via 3c80f49dc4e5da4e32febe077d17c19897417ad5 (commit) from 325d4643fc8536f1a461e7889b3568085bfc3312 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf-all.git/commit/?id=3c80f49dc4e5da4... commit 3c80f49dc4e5da4e32febe077d17c19897417ad5 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; make atri build explicitly specify javascript parameter diff --git a/Makefile b/Makefile index 78c2356..2d2c4ce 100644 --- a/Makefile +++ b/Makefile @@ -23,14 +23,19 @@ NSLIB_FB_TARG := libnsfb NSLIB_RO_TARG := librufl libpencil -# only build what we reuire for the target +# only build what we require for the target ifeq ($(TARGET),riscos) NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_RO_TARG) else ifeq ($(TARGET),framebuffer) NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_FB_TARG) else - NSLIB_TARG := $(NSLIB_ALL_TARG) + ifeq ($(TARGET),amiga) + NSLIB_TARG := $(NSLIB_ALL_TARG) + NETSURF_CONFIG := NETSURF_USE_MOZJS=YES + else + NSLIB_TARG := $(NSLIB_ALL_TARG) + endif endif endif @@ -54,7 +59,7 @@ $(TMP_PREFIX)/build-stamp: mkdir -p $(TMP_PREFIX)/bin $(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L))) $(MAKE) install --directory=$(NSGENBIND_TARG) PREFIX=$(TMP_PREFIX) TARGET=$(shell uname -s) - $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) + $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) $(NETSURF_CONFIG) touch $@ package: $(TMP_PREFIX)/build-stamp ----------------------------------------------------------------------- Summary of changes: Makefile | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 78c2356..2d2c4ce 100644 --- a/Makefile +++ b/Makefile @@ -23,14 +23,19 @@ NSLIB_FB_TARG := libnsfb NSLIB_RO_TARG := librufl libpencil -# only build what we reuire for the target +# only build what we require for the target ifeq ($(TARGET),riscos) NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_RO_TARG) else ifeq ($(TARGET),framebuffer) NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_FB_TARG) else - NSLIB_TARG := $(NSLIB_ALL_TARG) + ifeq ($(TARGET),amiga) + NSLIB_TARG := $(NSLIB_ALL_TARG) + NETSURF_CONFIG := NETSURF_USE_MOZJS=YES + else + NSLIB_TARG := $(NSLIB_ALL_TARG) + endif endif endif @@ -54,7 +59,7 @@ $(TMP_PREFIX)/build-stamp: mkdir -p $(TMP_PREFIX)/bin $(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L))) $(MAKE) install --directory=$(NSGENBIND_TARG) PREFIX=$(TMP_PREFIX) TARGET=$(shell uname -s) - $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) + $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) $(NETSURF_CONFIG) touch $@ package: $(TMP_PREFIX)/build-stamp -- NetSurf 'all' tree. Typically used for releases