[ecmascript] Moved css2xpath

src/ecmascript/Makefile

@@ -4,7 +4,7 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
 SUBDIRS-$(CONFIG_ECMASCRIPT_SMJS)	+= spidermonkey
 
-OBJS-$(CONFIG_ECMASCRIPT_SMJS)		+= ecmascript.o spidermonkey.o
+OBJS-$(CONFIG_ECMASCRIPT_SMJS)		+= css2xpath.o ecmascript.o spidermonkey.o
 
 ifeq ($(CONFIG_ECMASCRIPT_SMJS), yes)
 CONFIG_ANY_SPIDERMONKEY = yes

src/ecmascript/css2xpath.c

@@ -15,7 +15,7 @@
 #include <string>
 #include <regex>
 
-#include "ecmascript/spidermonkey/css2xpath.h"
+#include "ecmascript/css2xpath.h"
 
 namespace std
 {

src/ecmascript/css2xpath.h

@@ -0,0 +1,8 @@
+#ifndef EL__ECMASCRIPT_CSS2XPATH_H
+#define EL__ECMASCRIPT_CSS2XPATH_H
+
+#include <string>
+
+std::string css2xpath(std::string &selector);
+
+#endif

src/ecmascript/meson.build

@@ -1,7 +1,7 @@
 #INCLUDES += $(SPIDERMONKEY_CFLAGS)
 if conf_data.get('CONFIG_ECMASCRIPT_SMJS')
 	subdir('spidermonkey')
-	srcs += files('ecmascript.c', 'spidermonkey.c')
+	srcs += files('css2xpath.c', 'ecmascript.c', 'spidermonkey.c')
 endif
 
 if conf_data.get('CONFIG_ECMASCRIPT_SMJS')

src/ecmascript/spidermonkey/Makefile

@@ -2,7 +2,7 @@ top_builddir=../../..
 include $(top_builddir)/Makefile.config
 INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
-OBJS = attr.o attributes.o collection.o console.o css2xpath.o document.o element.o form.o heartbeat.o history.o implementation.o \
+OBJS = attr.o attributes.o collection.o console.o document.o element.o form.o heartbeat.o history.o implementation.o \
 	location.o localstorage.o localstorage-db.o navigator.o nodelist.o screen.o unibar.o window.o
 
 include $(top_srcdir)/Makefile.lib

src/ecmascript/spidermonkey/css2xpath.h

@@ -1,8 +0,0 @@
-#ifndef EL__ECMASCRIPT_SPIDERMONKEY_CSS2XPATH_H
-#define EL__ECMASCRIPT_SPIDERMONKEY_CSS2XPATH_H
-
-#include <string>
-
-std::string css2xpath(std::string &selector);
-
-#endif

src/ecmascript/spidermonkey/document.c

@@ -23,9 +23,9 @@
 #include "document/document.h"
 #include "document/forms.h"
 #include "document/view.h"
+#include "ecmascript/css2xpath.h"
 #include "ecmascript/ecmascript.h"
 #include "ecmascript/spidermonkey/collection.h"
-#include "ecmascript/spidermonkey/css2xpath.h"
 #include "ecmascript/spidermonkey/form.h"
 #include "ecmascript/spidermonkey/implementation.h"
 #include "ecmascript/spidermonkey/location.h"

src/ecmascript/spidermonkey/element.c

@@ -22,11 +22,11 @@
 #include "document/document.h"
 #include "document/forms.h"
 #include "document/view.h"
+#include "ecmascript/css2xpath.h"
 #include "ecmascript/ecmascript.h"
 #include "ecmascript/spidermonkey/attr.h"
 #include "ecmascript/spidermonkey/attributes.h"
 #include "ecmascript/spidermonkey/collection.h"
-#include "ecmascript/spidermonkey/css2xpath.h"
 #include "ecmascript/spidermonkey/element.h"
 #include "ecmascript/spidermonkey/nodelist.h"
 #include "ecmascript/spidermonkey/window.h"

src/ecmascript/spidermonkey/meson.build

@@ -1,3 +1,3 @@
 #INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
-srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'css2xpath.c', 'document.c', 'element.c', 'form.c', 'heartbeat.c', 'history.c', 'implementation.c', 'location.c', 'localstorage.c', 'localstorage-db.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c')
+srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'document.c', 'element.c', 'form.c', 'heartbeat.c', 'history.c', 'implementation.c', 'location.c', 'localstorage.c', 'localstorage-db.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c')