[mujs] moved files from ecmascript/libdom/mujs to ecmascript/mujs

To be consistent with header files.

src/ecmascript/Makefile

@@ -4,6 +4,8 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS) $(MUJS_CFLAGS)
 
 SUBDIRS-$(CONFIG_LIBDOM)	+= libdom
 
+SUBDIRS-$(CONFIG_MUJS)	+= mujs
+
 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_MUJS)		+= mujs
 SUBDIRS-$(CONFIG_QUICKJS)	+= quickjs
 SUBDIRS-$(CONFIG_ECMASCRIPT_SMJS)	+= spidermonkey
 

src/ecmascript/libdom/meson.build

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

src/ecmascript/meson.build

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

src/ecmascript/mujs.cpp

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

src/ecmascript/mujs/Makefile

@@ -1,4 +1,4 @@
-top_builddir=../../../..
+top_builddir=../../..
 include $(top_builddir)/Makefile.config
 
 OBJS = attr.o attributes.o collection.o console.o document.o element.o form.o forms.o history.o implementation.o input.o \

src/ecmascript/mujs/attr.c

@@ -14,7 +14,7 @@
 #include "elinks.h"
 
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/mujs/mapa.h"
+#include "ecmascript/mujs/mapa.h"
 #include "ecmascript/mujs.h"
 #include "ecmascript/mujs/attr.h"
 

src/ecmascript/mujs/attributes.c

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

src/ecmascript/mujs/collection.c

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

src/ecmascript/mujs/document.c

@@ -28,7 +28,7 @@
 #include "document/libdom/doc.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/mujs/mapa.h"
+#include "ecmascript/mujs/mapa.h"
 #include "ecmascript/libdom/parse.h"
 #include "ecmascript/mujs.h"
 #include "ecmascript/mujs/collection.h"

src/ecmascript/mujs/element.c

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

src/ecmascript/mujs/form.c

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

src/ecmascript/mujs/forms.c

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

src/ecmascript/mujs/input.c

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

src/ecmascript/mujs/mapa.cpp

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

src/ecmascript/mujs/nodelist.c

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

src/ecmascript/mujs/style.c

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

src/ecmascript/mujs/xhr.c

@@ -22,7 +22,7 @@
 #include "document/forms.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
-#include "ecmascript/libdom/mujs/mapa.h"
+#include "ecmascript/mujs/mapa.h"
 #include "ecmascript/mujs.h"
 #include "ecmascript/mujs/xhr.h"
 #include "ecmascript/timer.h"