From 5631943e401c9bb4cf1626b19639c41cda860d58 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@digital-scurf.org>
Date: Fri, 2 Nov 2012 23:03:20 +0000
Subject: Ensure that we turn on JS sources if either of USE_JS or USE_MOZJS is
 triggered

---
 Makefile.sources.javascript | 8 ++++++++
 amiga/Makefile.target       | 4 ----
 gtk/Makefile.target         | 4 ----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.sources.javascript b/Makefile.sources.javascript
index af405e874..9803f7a83 100644
--- a/Makefile.sources.javascript
+++ b/Makefile.sources.javascript
@@ -32,6 +32,14 @@ endef
 
 # Javascript sources
 ifeq ($(NETSURF_USE_JS),YES)
+WANT_JS_SOURCE := YES
+endif
+
+ifeq ($(NETSURF_USE_MOZJS),YES)
+WANT_JS_SOURCE := YES
+endif
+
+ifeq ($(WANT_JS_SOURCE),YES)
 
 S_JSAPI = 
 
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 61de77b36..af297bf1f 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -74,10 +74,6 @@ else
   endif
 endif
 
-ifeq ($(NETSURF_USE_MOZJS),YES)
-  NETSURF_USE_JS:=YES
-endif
-
 # ----------------------------------------------------------------------------
 # Source file setup
 # ----------------------------------------------------------------------------
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 769b86658..ca1bb44a0 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -35,10 +35,6 @@ $(eval $(call pkg_config_find_and_add,MOZJS,mozjs185,JavaScript))
 $(eval $(call pkg_config_find_and_add,JS,mozilla-js,JavaScript))
 $(eval $(call pkg_config_find_and_add,VIDEO,gstreamer-0.10,Video))
 
-ifeq ($(NETSURF_USE_MOZJS),YES)
-NETSURF_USE_JS:=YES
-endif
-
 # GTK and GLIB flags to disable depricated usage
 GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
 		-DG_DISABLE_DEPRECATED \
-- 
cgit v1.2.3