Tidy up Javascript build system

Examples/Makefile.in

@@ -633,9 +633,6 @@ java_clean:
 ROOT_DIR = @ROOT_DIR@
 JSINCLUDES = @JSCOREINC@ @JSV8INC@
 JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@
-JSSO =@JSSO@
-JSLDSHARED = @JSLDSHARED@
-JSCXXSHARED = @JSCXXSHARED@
 NODEJS = @NODEJS@
 NODEGYP = @NODEGYP@
 
@@ -731,7 +728,7 @@ javascript_clean:
 	rm -rf build
 	rm -f *_wrap* $(RUNME)
 	rm -f core @EXTRA_CLEAN@
-	rm -f *.@OBJEXT@ *@JSSO@ *.$(SO)
+	rm -f *.@OBJEXT@ *@SO@
 	rm -f binding.gyp example-gypcopy.cxx
 	cd $(ROOT_DIR)/Tools/javascript && $(MAKE) -s clean
 

Examples/test-suite/javascript/Makefile.in

@@ -6,6 +6,8 @@ LANGUAGE     = javascript
 NODEGYP = @NODEGYP@
 NODEJS = @NODEJS@
 SCRIPTSUFFIX = _runme.js
+OBJ = @OBJ@
+SO = @SO@
 
 srcdir       = @srcdir@
 top_srcdir   = @top_srcdir@
@@ -116,10 +118,10 @@ endif
 
 %.clean:
 	@rm -rf $*
-	@rm -f $*_wrap.* $*.so $*.o
+	@rm -f $*_wrap.* $*$(SO) $*$(OBJ)
 
 clean:
-	for ext in _wrap.cxx _wrap.o .so; do \
+	for ext in _wrap.cxx _wrap$(OBJ) $(SO); do \
 		rm -f clientdata_prop_a$${ext} clientdata_prop_b$${ext}; \
 		rm -f imports_a$${ext} imports_b$${ext}; \
 		rm -f import_stl_a$${ext} import_stl_b$${ext}; \

Tools/javascript/Makefile.in

@@ -26,10 +26,6 @@ LINKFLAGS = @JSINTERPRETERLINKFLAGS@
 ROOT_DIR = @ROOT_DIR@
 JSINCLUDES = @JSCOREINC@ @JSV8INC@
 JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@
-JSLIBRARYPREFIX = @JSLIBRARYPREFIX@
-JSSO =@JSSO@
-JSLDSHARED = @JSLDSHARED@
-JSCXXSHARED = @JSCXXSHARED@
 JSV8ENABLED = @JSV8ENABLED@
 JSCENABLED = @JSCENABLED@
 

configure.ac

@@ -1123,28 +1123,15 @@ else
   # General Javascript settings shared by JSC and V8
   #----------------------------------------------------------------
 
-  case $host in
-  *-*-cygwin* | *-*-mingw*)
-    JSLIBRARYPREFIX=""
-    ;;
-  *)
-    JSLIBRARYPREFIX="lib"
-    ;;
-  esac
-
   case $host in
   *-*-darwin*)
     JSSO=".dylib"
-    JSLDSHARED='$(CC) -dynamiclib'
-    JSCXXSHARED='$(CXX) -dynamiclib'
     # HACK: didn't manage to get dynamic module loading working with a g++ compiled interpreter
     JSINTERPRETERCXX='c++'
     JSINTERPRETERLINKFLAGS='-g -Wl,-search_paths_first -Wl,-headerpad_max_install_names'
     ;;
   *)
     JSSO=$SO
-    JSLDSHARED='$(LDSHARED)'
-    JSCXXSHARED='$(CXXSHARED)'
     JSINTERPRETERCXX='$(CXX)'
     JSINTERPRETERLINKFLAGS='-ldl'
     ;;
@@ -1296,11 +1283,6 @@ else
 
 fi
 
-AC_SUBST(JSLIBRARYPREFIX)
-AC_SUBST(JSSO)
-AC_SUBST(JSLDSHARED)
-AC_SUBST(JSCXXSHARED)
-
 AC_SUBST(JSINTERPRETERCXX)
 AC_SUBST(JSINTERPRETERLINKFLAGS)