- build: Fix build with autotools, other build improvements

> Restore the Makefile.am files for squirrel.
> Remove mentions of sqplus.
> Add new files.
> Remove include paths to sc_utils.h and similar, they now have to be
  specified with a full path relative to src/include.

git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12416 2a5c6006-c6dd-42ca-98ab-0921f2732cef

Author: fuscated

codeblocks.pc.in

@@ -14,5 +14,4 @@ Cflags: -I${includedir}/@PACKAGE@ \
 			-I${includedir}/@PACKAGE@/tinyxml \
 			-I${includedir}/@PACKAGE@/scripting/include \
 			-I${includedir}/@PACKAGE@/scripting/bindings \
-			-I${includedir}/@PACKAGE@/scripting/sqplus \
 			-I${includedir}/@PACKAGE@/wxscintilla/include

configure.ac

@@ -394,16 +394,12 @@ AC_CONFIG_FILES([Makefile
 	src/include/scripting/Makefile
 	src/include/scripting/bindings/Makefile
 	src/include/scripting/include/Makefile
-	src/include/scripting/sqplus/Makefile
-	src/include/scripting/sqstdlib/Makefile
-	src/include/scripting/squirrel/Makefile
 	src/include/tinyxml/Makefile
 	src/sdk/Makefile
 	src/sdk/scripting/Makefile
 	src/sdk/scripting/bindings/Makefile
 	src/sdk/scripting/squirrel/Makefile
 	src/sdk/scripting/sqstdlib/Makefile
-	src/sdk/scripting/sqplus/Makefile
 	src/sdk/wxscintilla/Makefile
 	src/sdk/resources/Makefile
 	src/sdk/resources/lexers/Makefile

src/CodeBlocks_wx30-unix.cbp

@@ -92,7 +92,6 @@
 					<Add option="`pkg-config glib-2.0 --cflags`" />
 					<Add directory="include" />
 					<Add directory="include/tinyxml" />
-					<Add directory="include/scripting/bindings" />
 					<Add directory="include/scripting/include" />
 					<Add directory="sdk/mozilla_chardet/include" />
 					<Add directory="sdk/mozilla_chardet/include/mfbt" />
@@ -144,8 +143,6 @@
 				<Compiler>
 					<Add directory="include" />
 					<Add directory="include/scripting/include" />
-					<Add directory="include/scripting/sqplus" />
-					<Add directory="include/scripting/bindings" />
 				</Compiler>
 				<Linker>
 					<Add option="`$(WX_CONFIG) --libs`" />
@@ -218,7 +215,6 @@
 					<Add directory="include" />
 					<Add directory="plugins/compilergcc/depslib/src" />
 					<Add directory="include/scripting/include" />
-					<Add directory="include/scripting/sqplus" />
 				</Compiler>
 				<Linker>
 					<Add option="`$(WX_CONFIG) --libs std,propgrid`" />
@@ -374,7 +370,6 @@
 				<Compiler>
 					<Add directory="include" />
 					<Add directory="include/scripting/include" />
-					<Add directory="include/scripting/sqplus" />
 				</Compiler>
 				<Linker>
 					<Add option="`$(WX_CONFIG) --libs`" />

src/include/Makefile.am

@@ -14,8 +14,7 @@ endif
 AM_CPPFLAGS = $(WX_CXXFLAGS) \
 			-I$(top_builddir)/src/include \
 			-I$(top_srcdir)/src/include \
-			-I$(top_srcdir)/src/sdk/wxscintilla/include \
-			-I$(top_srcdir)/src/include/scripting/sqplus
+			-I$(top_srcdir)/src/sdk/wxscintilla/include
 
 # Because we are not generating any programs/libraries with this makefile,
 # $(CXXCOMPILE) is empty.

src/include/scripting/Makefile.am

@@ -1,5 +1,5 @@
-SUBDIRS = sqplus bindings
-DIST_SUBDIRS = squirrel sqstdlib sqplus bindings include
+SUBDIRS = bindings
+DIST_SUBDIRS = bindings include
 if ! HAVE_SQUIRREL
-SUBDIRS += squirrel sqstdlib include
+SUBDIRS += bindings include
 endif

src/include/scripting/bindings/Makefile.am

@@ -1,5 +1,7 @@
 sdkdir=$(includedir)/codeblocks/scripting/bindings
 
-noinst_HEADERS = scriptbindings.h
+noinst_HEADERS = \
+	sc_typeinfo_all.h \
+	sc_utils.h
 
 sdk_HEADERS = sc_plugin.h

src/include/scripting/include/Makefile.am

@@ -0,0 +1,12 @@
+sdkdir=$(includedir)/codeblocks/scripting/include
+
+sdk_HEADERS = \
+	sqconfig.h \
+	sqstdaux.h \
+	sqstdblob.h \
+	sqstdio.h \
+	sqstdmath.h \
+	sqstdstring.h \
+	sqstdsystem.h \
+	squirrel.h
+

src/plugins/abbreviations/Makefile.am

@@ -3,9 +3,7 @@ SUBDIRS = resources
 AM_CPPFLAGS = $(WX_CXXFLAGS) \
 		$(CB_SQUIRREL_CFLAGS) \
 		-I$(top_srcdir)/src/include \
-		-I$(top_srcdir)/src/sdk/wxscintilla/include \
-		-I$(top_srcdir)/src/include/scripting/sqplus \
-		-I$(top_srcdir)/src/include/scripting/bindings
+		-I$(top_srcdir)/src/sdk/wxscintilla/include
 
 pluginlibdir = $(pkglibdir)/plugins
 

src/plugins/abbreviations/abbreviations.cpp

@@ -18,14 +18,15 @@
     #include "editormanager.h"
     #include "logmanager.h"
     #include "macrosmanager.h"
+    #include "scriptingmanager.h"
 #endif
 
 #include "abbreviations.h"
 #include "abbreviationsconfigpanel.h"
 #include "ccmanager.h"
 #include "editor_hooks.h"
-#include "sc_utils.h"
-#include "sc_typeinfo_all.h"
+#include "scripting/bindings/sc_utils.h"
+#include "scripting/bindings/sc_typeinfo_all.h"
 
 // Register the plugin with Code::Blocks.
 // We are using an anonymous namespace so we don't litter the global one.

src/plugins/compilergcc/Makefile.am

@@ -4,7 +4,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \
 		$(CB_SQUIRREL_CFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
-		-I$(top_srcdir)/src/include/scripting/sqplus \
 		-I$(top_srcdir)/src/plugins/compilergcc/depslib/src
 
 AM_CXXFLAGS = -DDEPSLIB_UNIX