From f3b515540e17c6742fa601057bf632763885d027 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sun, 10 Mar 2013 13:45:02 +0000
Subject: move javascript makefile

---
 Makefile.sources            |  2 +-
 Makefile.sources.javascript | 63 ---------------------------------------------
 javascript/Makefile         | 63 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 Makefile.sources.javascript
 create mode 100644 javascript/Makefile

diff --git a/Makefile.sources b/Makefile.sources
index ab71ff36a..b7d32d67f 100644
--- a/Makefile.sources
+++ b/Makefile.sources
@@ -30,7 +30,7 @@ S_DESKTOP := cookies.c history_global_core.c hotlist.c knockout.c	\
 	tree_url_node.c version.c
 
 # Javascript source
-include Makefile.sources.javascript
+include javascript/Makefile
 
 # S_COMMON are sources common to all builds
 S_COMMON := $(addprefix content/,$(S_CONTENT))				\
diff --git a/Makefile.sources.javascript b/Makefile.sources.javascript
deleted file mode 100644
index bcdd68501..000000000
--- a/Makefile.sources.javascript
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# NetSurf javascript source file inclusion
-#
-# Included by Makefile.sources 
-#
-
-# ----------------------------------------------------------------------------
-# JSAPI binding
-# ----------------------------------------------------------------------------
-
-S_JSAPI_BINDING:=
-D_JSAPI_BINDING:=
-
-JSAPI_BINDING_htmldocument := javascript/jsapi/htmldocument.bnd
-JSAPI_BINDING_htmlelement := javascript/jsapi/htmlelement.bnd
-JSAPI_BINDING_window := javascript/jsapi/window.bnd
-JSAPI_BINDING_navigator := javascript/jsapi/navigator.bnd
-JSAPI_BINDING_console := javascript/jsapi/console.bnd
-JSAPI_BINDING_location := javascript/jsapi/location.bnd
-JSAPI_BINDING_htmlcollection := javascript/jsapi/htmlcollection.bnd
-JSAPI_BINDING_nodelist := javascript/jsapi/nodelist.bnd
-JSAPI_BINDING_text := javascript/jsapi/text.bnd
-JSAPI_BINDING_comment := javascript/jsapi/comment.bnd
-JSAPI_BINDING_node := javascript/jsapi/node.bnd
-JSAPI_BINDING_event := javascript/jsapi/event.bnd
-
-# 1: input binding file
-# 2: source output file
-# 3: header output file
-# 4: binding name
-define convert_jsapi_binding
-
-S_JSAPI_BINDING += $(2)
-D_JSAPI_BINDING += $(patsubst %.c,%.d,$(2))
-
-$(2): $(1) $(OBJROOT)/created
-	$$(VQ)echo " GENBIND: $(1)"
-	$(Q)nsgenbind -I javascript/WebIDL -d $(patsubst %.c,%.d,$(2)) -h $(3) -o $(2) $(1)
-
-$(3): $(2)
-
-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 :=
-
-S_JAVASCRIPT += content.c jsapi.c $(addprefix jsapi/,$(S_JSAPI))
-
-$(eval $(foreach V,$(filter JSAPI_BINDING_%,$(.VARIABLES)),$(call convert_jsapi_binding,$($(V)),$(OBJROOT)/$(patsubst JSAPI_BINDING_%,%,$(V)).c,$(OBJROOT)/$(patsubst JSAPI_BINDING_%,%,$(V)).h,$(patsubst JSAPI_BINDING_%,%,$(V))_jsapi)))
-
-else
-S_JAVASCRIPT += none.c
-endif
diff --git a/javascript/Makefile b/javascript/Makefile
new file mode 100644
index 000000000..bcdd68501
--- /dev/null
+++ b/javascript/Makefile
@@ -0,0 +1,63 @@
+#
+# NetSurf javascript source file inclusion
+#
+# Included by Makefile.sources 
+#
+
+# ----------------------------------------------------------------------------
+# JSAPI binding
+# ----------------------------------------------------------------------------
+
+S_JSAPI_BINDING:=
+D_JSAPI_BINDING:=
+
+JSAPI_BINDING_htmldocument := javascript/jsapi/htmldocument.bnd
+JSAPI_BINDING_htmlelement := javascript/jsapi/htmlelement.bnd
+JSAPI_BINDING_window := javascript/jsapi/window.bnd
+JSAPI_BINDING_navigator := javascript/jsapi/navigator.bnd
+JSAPI_BINDING_console := javascript/jsapi/console.bnd
+JSAPI_BINDING_location := javascript/jsapi/location.bnd
+JSAPI_BINDING_htmlcollection := javascript/jsapi/htmlcollection.bnd
+JSAPI_BINDING_nodelist := javascript/jsapi/nodelist.bnd
+JSAPI_BINDING_text := javascript/jsapi/text.bnd
+JSAPI_BINDING_comment := javascript/jsapi/comment.bnd
+JSAPI_BINDING_node := javascript/jsapi/node.bnd
+JSAPI_BINDING_event := javascript/jsapi/event.bnd
+
+# 1: input binding file
+# 2: source output file
+# 3: header output file
+# 4: binding name
+define convert_jsapi_binding
+
+S_JSAPI_BINDING += $(2)
+D_JSAPI_BINDING += $(patsubst %.c,%.d,$(2))
+
+$(2): $(1) $(OBJROOT)/created
+	$$(VQ)echo " GENBIND: $(1)"
+	$(Q)nsgenbind -I javascript/WebIDL -d $(patsubst %.c,%.d,$(2)) -h $(3) -o $(2) $(1)
+
+$(3): $(2)
+
+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 :=
+
+S_JAVASCRIPT += content.c jsapi.c $(addprefix jsapi/,$(S_JSAPI))
+
+$(eval $(foreach V,$(filter JSAPI_BINDING_%,$(.VARIABLES)),$(call convert_jsapi_binding,$($(V)),$(OBJROOT)/$(patsubst JSAPI_BINDING_%,%,$(V)).c,$(OBJROOT)/$(patsubst JSAPI_BINDING_%,%,$(V)).h,$(patsubst JSAPI_BINDING_%,%,$(V))_jsapi)))
+
+else
+S_JAVASCRIPT += none.c
+endif
-- 
cgit v1.2.3