[quickjs] Moved files from ecmascript/libdom/quickjs to ecmascript/quickjs

src/ecmascript/Makefile

@@ -6,6 +6,8 @@ SUBDIRS-$(CONFIG_LIBDOM)	+= libdom
 
 SUBDIRS-$(CONFIG_MUJS)	+= mujs
 
+SUBDIRS-$(CONFIG_QUICKJS)	+= quickjs
+
 OBJS-$(CONFIG_ECMASCRIPT_SMJS)		+= ecmascript.obj localstorage-db.obj spidermonkey.obj timer.obj
 
 OBJS-$(CONFIG_MUJS)		+= ecmascript.obj localstorage-db.obj mujs.obj timer.obj

src/ecmascript/libdom/Makefile

@@ -2,7 +2,6 @@ top_builddir=../../..
 include $(top_builddir)/Makefile.config
 INCLUDES += $(LIBDOM_CFLAGS)
 
-SUBDIRS-$(CONFIG_QUICKJS)	+= quickjs
 SUBDIRS-$(CONFIG_ECMASCRIPT_SMJS)	+= spidermonkey
 
 OBJS = parse.o

src/ecmascript/libdom/meson.build

@@ -1,7 +1,3 @@
-if conf_data.get('CONFIG_QUICKJS')
-	subdir('quickjs')
-endif
-
 if conf_data.get('CONFIG_ECMASCRIPT_SMJS')
 	subdir('spidermonkey')
 endif

src/ecmascript/libdom/quickjs/Makefile

@@ -1,7 +0,0 @@
-top_builddir=../../../..
-include $(top_builddir)/Makefile.config
-
-OBJS = attr.o attributes.o collection.o console.o document.o element.o form.o forms.o heartbeat.o history.o implementation.o input.o \
-	keyboard.o localstorage.o location.o mapa.obj message.o navigator.o nodelist.o screen.o style.o unibar.o window.o xhr.o
-
-include $(top_srcdir)/Makefile.lib

src/ecmascript/libdom/quickjs/meson.build

@@ -1,3 +0,0 @@
-srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'document.c', 'element.c', 'form.c', 'forms.c', 'heartbeat.c', 'history.c',
-'implementation.c', 'input.c', 'keyboard.c', 'localstorage.c', 'location.c',
-'mapa.cpp', 'message.c', 'navigator.c', 'nodelist.c', 'screen.c', 'style.c', 'unibar.c', 'window.c', 'xhr.c')

src/ecmascript/meson.build

@@ -22,6 +22,7 @@ endif
 
 if conf_data.get('CONFIG_QUICKJS')
 	srcs += files('ecmascript.cpp', 'localstorage-db.cpp', 'quickjs.cpp', 'timer.cpp')
+	subdir('quickjs')
 endif
 
 if conf_data.get('CONFIG_LIBDOM')

src/ecmascript/quickjs.cpp

@@ -24,7 +24,6 @@
 #include "document/renderer.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/console.h"
 #include "ecmascript/quickjs/document.h"
@@ -33,6 +32,7 @@
 #include "ecmascript/quickjs/history.h"
 #include "ecmascript/quickjs/localstorage.h"
 #include "ecmascript/quickjs/location.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs/navigator.h"
 #include "ecmascript/quickjs/screen.h"
 #include "ecmascript/quickjs/unibar.h"

src/ecmascript/quickjs/attr.c

@@ -14,7 +14,7 @@
 #include "elinks.h"
 
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 
 #define countof(x) (sizeof(x) / sizeof((x)[0]))

src/ecmascript/quickjs/attributes.c

@@ -15,7 +15,7 @@
 
 #include "document/libdom/corestrings.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/attr.h"
 #include "ecmascript/quickjs/attributes.h"

src/ecmascript/quickjs/collection.c

@@ -17,7 +17,7 @@
 
 #include "document/libdom/corestrings.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/collection.h"
 #include "ecmascript/quickjs/element.h"

src/ecmascript/quickjs/document.c

@@ -22,7 +22,7 @@
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
 #include "ecmascript/libdom/parse.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/collection.h"
 #include "ecmascript/quickjs/form.h"

src/ecmascript/quickjs/element.c

@@ -21,7 +21,7 @@
 #include "document/libdom/mapa.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/attr.h"
 #include "ecmascript/quickjs/attributes.h"

src/ecmascript/quickjs/form.c

@@ -13,7 +13,7 @@
 #include "document/forms.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/document.h"
 #include "ecmascript/quickjs/form.h"

src/ecmascript/quickjs/forms.c

@@ -14,7 +14,7 @@
 #include "document/forms.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/document.h"
 #include "ecmascript/quickjs/form.h"

src/ecmascript/quickjs/input.c

@@ -14,7 +14,7 @@
 #include "document/document.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/document.h"
 #include "ecmascript/quickjs/form.h"

src/ecmascript/quickjs/mapa.cpp

@@ -6,8 +6,8 @@
 
 #include "elinks.h"
 
-#include "ecmascript/libdom/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs/xhr.h"
 #include "util/memory.h"
 #include "util/string.h"

src/ecmascript/quickjs/nodelist.c

@@ -16,7 +16,7 @@
 #include "elinks.h"
 
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/element.h"
 #include "ecmascript/quickjs/nodelist.h"

src/ecmascript/quickjs/style.c

@@ -15,7 +15,7 @@
 
 #include "document/libdom/corestrings.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs/style.h"
 #include "ecmascript/quickjs.h"
 

src/ecmascript/quickjs/xhr.c

@@ -39,7 +39,7 @@
 #include "cache/cache.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/quickjs/mapa.h"
+#include "ecmascript/quickjs/mapa.h"
 #include "ecmascript/quickjs.h"
 #include "ecmascript/quickjs/heartbeat.h"
 #include "ecmascript/quickjs/xhr.h"