From a3ad811cee7915d612561fd47e678fe5e214f39a Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 10 Apr 2014 19:15:46 +0100
Subject: [PATCH] Makefile and autoconf file tidy up for Javascript

---
 Source/Makefile.am           | 2 +-
 Tools/javascript/Makefile.in | 2 --
 configure.ac                 | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Source/Makefile.am b/Source/Makefile.am
index 4dbede635..9e02e37f0 100644
--- a/Source/Makefile.am
+++ b/Source/Makefile.am
@@ -48,8 +48,8 @@ eswig_SOURCES =	CParse/cscanner.c		\
 		Modules/go.cxx			\
 		Modules/guile.cxx		\
 		Modules/java.cxx		\
-		Modules/lang.cxx		\
 		Modules/javascript.cxx		\
+		Modules/lang.cxx		\
 		Modules/lua.cxx			\
 		Modules/main.cxx		\
 		Modules/modula3.cxx		\
diff --git a/Tools/javascript/Makefile.in b/Tools/javascript/Makefile.in
index d58412b50..373c5d952 100644
--- a/Tools/javascript/Makefile.in
+++ b/Tools/javascript/Makefile.in
@@ -20,8 +20,6 @@ CXXFLAGS   = @BOOST_CPPFLAGS@ @PLATCXXFLAGS@
 LINKFLAGS = @JSINTERPRETERLINKFLAGS@
 
 ROOT_DIR = @ROOT_DIR@
-JSCFLAGS = @JSCFLAGS@
-JSCXXFLAGS = @JSCXXFLAGS@
 JSINCLUDES = @JSCOREINC@ @JSV8INC@
 JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@
 JSLIBRARYPREFIX = @JSLIBRARYPREFIX@
diff --git a/configure.ac b/configure.ac
index 876940065..304e1215e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2634,7 +2634,6 @@ AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWI
 AC_CONFIG_FILES([
     Makefile
     swig.spec
-    Source/Makefile
     Examples/Makefile
     Examples/xml/Makefile
     Examples/test-suite/errors/Makefile
@@ -2644,7 +2643,6 @@ AC_CONFIG_FILES([
     Examples/test-suite/guile/Makefile
     Examples/test-suite/java/Makefile
     Examples/test-suite/javascript/Makefile
-    Tools/javascript/Makefile
     Examples/test-suite/mzscheme/Makefile
     Examples/test-suite/ocaml/Makefile
     Examples/test-suite/octave/Makefile
@@ -2661,6 +2659,8 @@ AC_CONFIG_FILES([
     Examples/test-suite/uffi/Makefile
     Examples/test-suite/r/Makefile
     Examples/test-suite/go/Makefile
+    Source/Makefile
+    Tools/javascript/Makefile
 ])
 AC_CONFIG_FILES([preinst-swig], [chmod +x preinst-swig])
 AC_CONFIG_FILES([CCache/ccache_swig_config.h])