Fix configuration for ctest with Javascript/v8.

Examples/Makefile.in

@@ -630,11 +630,22 @@ javascript_build_node: $(SRCS)
 
 # These targets are used by the test-suite:
 
+ifeq (jsc, $(ENGINE))
+
 javascript: $(SRCS) javascript_custom_interpreter
 	$(SWIG) -javascript $(SWIGOPT) $(INTERFACEPATH)
 	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(JSINCLUDES)
 	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
 
+else # (v8 | node) # v8 and node must be compiled as c++
+
+javascript: $(SRCS) javascript_custom_interpreter
+	$(SWIG) -javascript $(SWIGOPT) $(INTERFACEPATH)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(JSINCLUDES)
+	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
+
+endif
+
 javascript_cpp: $(SRCS) javascript_custom_interpreter
 	$(SWIG) -javascript -c++ $(SWIGOPT) $(INTERFACEPATH)
 	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(JSINCLUDES)

Examples/test-suite/javascript/Makefile.in

@@ -89,6 +89,11 @@ else
 			$(top_srcdir)/Tools/javascript/javascript -$(JSENGINE) $(srcdir)/$*$(SCRIPTSUFFIX); \
 		fi
 
+  %.ctest:
+		$(_setup)
+		+$(swig_and_compile_c)
+		$(run_testcase)
+
   %.cpptest:
 		$(_setup)
 		+$(swig_and_compile_cpp)
@@ -101,20 +106,6 @@ else
 
 endif
 
-ifeq (v8,$(ENGINE))
-  %.ctest:
-		$(_setup)
-		+$(swig_and_compile_cpp)
-		$(run_testcase)
-
-endif
-
-ifeq (jsc,$(ENGINE))
-  %.ctest:
-		$(_setup)
-		+$(swig_and_compile_c)
-		$(run_testcase)
-endif
 
 %.clean:
 	rm -rf $*