summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--Makefile.defaults6
2 files changed, 8 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index ff36456e7..784c42f6c 100644
--- a/Makefile
+++ b/Makefile
@@ -498,6 +498,7 @@ include Makefile.defaults
$(eval $(call feature_switch,JPEG,JPEG (libjpeg),-DWITH_JPEG,-ljpeg,-UWITH_JPEG,))
$(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf -lpng,-UWITH_PDF_EXPORT,))
$(eval $(call feature_switch,LIBICONV_PLUG,glibc internal iconv,-DLIBICONV_PLUG,,-ULIBICONV_PLUG,-liconv))
+$(eval $(call feature_switch,DUKTAPE,Javascript (Duktape),,,,,))
# Common libraries with pkgconfig
$(eval $(call pkg_config_find_and_add,libcss,CSS))
@@ -526,17 +527,17 @@ CXXFLAGS += -DNETSURF_HOMEPAGE=\"$(NETSURF_HOMEPAGE)\"
$(OBJROOT)/created:
$(VQ)echo " MKDIR: $(OBJROOT)"
- $(Q)$(MKDIR) $(OBJROOT)
+ $(Q)$(MKDIR) -p $(OBJROOT)
$(Q)$(TOUCH) $(OBJROOT)/created
$(DEPROOT)/created: $(OBJROOT)/created
$(VQ)echo " MKDIR: $(DEPROOT)"
- $(Q)$(MKDIR) $(DEPROOT)
+ $(Q)$(MKDIR) -p $(DEPROOT)
$(Q)$(TOUCH) $(DEPROOT)/created
$(TOOLROOT)/created: $(OBJROOT)/created
$(VQ)echo " MKDIR: $(TOOLROOT)"
- $(Q)$(MKDIR) $(TOOLROOT)
+ $(Q)$(MKDIR) -p $(TOOLROOT)
$(Q)$(TOUCH) $(TOOLROOT)/created
CLEANS :=
@@ -782,7 +783,6 @@ $(eval $(foreach SOURCE,$(filter %.m,$(SOURCES)), \
ifeq ($(filter $(MAKECMDGOALS),clean test coverage),)
-include $(sort $(addprefix $(DEPROOT)/,$(DEPFILES)))
--include $(D_JSAPI_BINDING)
endif
# And rules to build the objects themselves...
diff --git a/Makefile.defaults b/Makefile.defaults
index e2d799950..09ac2243e 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -53,9 +53,11 @@ NETSURF_USE_VIDEO := NO
# Enable NetSurf's use of spidermonkey for javascript
# Valid options: YES, NO, AUTO
-NETSURF_USE_JS := AUTO
+NETSURF_USE_JS := NO
# Javascript support in older debian/ubuntu versions
-NETSURF_USE_MOZJS := AUTO
+NETSURF_USE_MOZJS := NO
+# Or use duktape
+NETSURF_USE_DUKTAPE := YES
# Enable NetSurf's use of libharu for PDF export and GTK printing support.
# There is no auto-detection available for this, as it does not have a