move mod_spidermoney build to automake, fix spidermoneky dependencies (I think this...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16333 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Freeswitch.2005.unsupported.sln b/Freeswitch.2005.unsupported.sln
index 517afffe07c280d43960a3571f7ad579fe4873e4..d0e6cf72a0faaf0f1d8caf34000c63b6ecb2e380 100644 (file)
--- a/Freeswitch.2005.unsupported.sln
+++ b/Freeswitch.2005.unsupported.sln
@@ -249,7 +249,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\
                {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
        ProjectSection(ProjectDependencies) = postProject
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -257,7 +257,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db",
                {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
        ProjectSection(ProjectDependencies) = postProject
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -274,7 +274,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applica
                {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
        ProjectSection(ProjectDependencies) = postProject
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -371,7 +371,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_socket.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"
        ProjectSection(ProjectDependencies) = postProject
                {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -751,7 +751,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voipcodecs", "src\mod\c
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey_curl\mod_spidermonkey_curl.vcproj", "{2CCED6DC-26FF-40F2-9585-E9E1049A4599}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_curl.vcproj", "{2CCED6DC-26FF-40F2-9585-E9E1049A4599}"
        ProjectSection(ProjectDependencies) = postProject
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}

diff --git a/Freeswitch.2008.express.sln b/Freeswitch.2008.express.sln
index 6050867a385ce96d7ec46bb397afadb4cf60252d..50f53c970ff3b302d8d0d36641ce005b9dbc358b 100644 (file)
--- a/Freeswitch.2008.express.sln
+++ b/Freeswitch.2008.express.sln
@@ -216,7 +216,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\
                {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.2008.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_core_db.2008.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -224,7 +224,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db",
                {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.2008.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_teletone.2008.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -241,7 +241,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applica
                {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.2008.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_odbc.2008.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -290,7 +290,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.2008.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_socket.2008.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -375,7 +375,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applicat
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey_curl\mod_spidermonkey_curl.2008.vcproj", "{36E854E3-CE12-4348-A125-CCF3F9D74813}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_curl.2008.vcproj", "{36E854E3-CE12-4348-A125-CCF3F9D74813}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r

diff --git a/Freeswitch.2008.sln b/Freeswitch.2008.sln
index 1f5945d68c53b084404d6a2d2d6b756f836fedda..cd427a8f727ffb415102b741f042f2c38a600ea7 100644 (file)
--- a/Freeswitch.2008.sln
+++ b/Freeswitch.2008.sln
@@ -589,7 +589,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\
                {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.2008.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_core_db.2008.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -597,7 +597,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db",
                {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.2008.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_teletone.2008.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -614,7 +614,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applica
                {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.2008.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_odbc.2008.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -663,7 +663,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.2008.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_socket.2008.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -748,7 +748,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applicat
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey_curl\mod_spidermonkey_curl.2008.vcproj", "{36E854E3-CE12-4348-A125-CCF3F9D74813}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_curl.2008.vcproj", "{36E854E3-CE12-4348-A125-CCF3F9D74813}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r

diff --git a/Makefile.am b/Makefile.am
index 49fb9421b79e8a2ea65523adc1a163e248231caf..7d50a55bf7274a2dce3f77b168e57b73344d9b35 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -355,11 +355,6 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree
          fi ; \
        fi ;
 
-JS_DIR=$(switch_srcdir)/libs/js
-JSLA=$(JS_DIR)/libjs.la
-$(JSLA): mod_spidermonkey-all
-mod_spidermonkey_curl-all mod_spidermonkey_teletone-all mod_spidermonkey_core_db-all mod_spidermonkey_socket-all mod_spidermonky_odbc-all mod_spidermonkey_curl-install mod_spidermonkey_teletone-install mod_spidermonkey_core_db-install mod_spidermonkey_socket-install mod_spidermonky_odbc-install: $(JSLA)
-
 ##
 ## Dependency targets
 ##

diff --git a/build/modules.conf.in b/build/modules.conf.in
index 19ae8f8cc5c9e18f5616e0c24336f2fa1f9bd183..0caf7cc8de2fa1f3302d900f737b1f0c6ee9a7ed 100644 (file)
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -76,11 +76,6 @@ formats/mod_file_string
 #formats/mod_shell_stream
 #languages/mod_python
 languages/mod_spidermonkey
-languages/mod_spidermonkey_curl
-languages/mod_spidermonkey_teletone
-languages/mod_spidermonkey_core_db
-languages/mod_spidermonkey_socket
-#languages/mod_spidermonkey_odbc
 languages/mod_lua
 #languages/mod_perl
 #languages/mod_yaml

diff --git a/configure.in b/configure.in
index e93de3d1e2371bde1dc5191f9723a39aaa265c47..a22072063feeb1bf42b4d2681b31f338e549ccc5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -705,7 +705,7 @@ GETSOUNDS="${SHELL} $switch_builddir/build/getsounds.sh"
 AC_SUBST(GETSOUNDS)
 
 
-LIBCURL_CHECK_CONFIG([yes], [7.13.0], [LIBCURL_DEPS=''], [LIBCURL_DEPS='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include'])
+LIBCURL_CHECK_CONFIG([yes], [7.13.0], [LIBCURL_DEPS=''], [LIBCURL_DEPS='${switch_builddir}/libs/curl/lib/libcurl.la';LIBCURL='${switch_builddir}/libs/curl/lib/libcurl.la';LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include'])
 AC_SUBST(LIBCURL_DEPS)
 
 
@@ -870,6 +870,7 @@ AC_CONFIG_FILES([Makefile
                 src/mod/asr_tts/mod_unimrcp/Makefile
                 src/mod/languages/mod_java/Makefile
                 src/mod/languages/mod_python/Makefile
+               src/mod/languages/mod_spidermonkey/Makefile
                 src/mod/event_handlers/mod_erlang_event/Makefile
                 src/include/switch_am_config.h
                 build/getsounds.sh

diff --git a/debian/rules b/debian/rules
index f4129ab45300390ab218bc4785058cf014380fa8..3dc5e51e00c69cd14ac81042c61543a886a5253e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@ export DH_OPTIONS
 export DH_COMPAT=4
 export DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr
-export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc \
-                           languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone
 # Modules listed by those built by default, then those that are added in this package
 export APPLICATIONS_MODULES=applications/mod_cluechoo applications/mod_commands applications/mod_conference applications/mod_dptools \
                             applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_fsv \
@@ -26,15 +24,15 @@ export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod
                         endpoints/mod_loopback ../../libs/openzap/mod_openzap endpoints/mod_skypiax
 export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv
 export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_shout
-export LANGUAGES_MODULES=languages/mod_perl languages/mod_lua
+export LANGUAGES_MODULES=languages/mod_spidermonkey languages/mod_perl languages/mod_lua
 export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog
 export SAY_MODULES=say/mod_say_en say/mod_say_it say/mod_say_de say/mod_say_fr say/mod_say_es say/mod_say_nl say/mod_say_ru
 export TIMERS_MODULES=
 export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python \
-                       languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe \
+                       asr_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe \
                        event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf
 export XML_INT_MODULES=xml_int/mod_xml_rpc  xml_int/mod_xml_curl xml_int/mod_xml_cdr
-export MYMODULES=$(PASSTHRU_CODEC_MODULES) $(SPIDERMONKEY_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(DIRECTORIES_MODULES) $(DOTNET_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(TIMERS_MODULES) $(XML_INT_MODULES)
+export MYMODULES=$(PASSTHRU_CODEC_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(DIRECTORIES_MODULES) $(DOTNET_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(TIMERS_MODULES) $(XML_INT_MODULES)
 export MODULES=$(MYMODULES)
 
 ifndef AUTOCONF

diff --git a/freeswitch.spec b/freeswitch.spec
index 4b69be1c0cf99ed85e8260e6a1a996cfaf465378..a3c3cc72b96541b9ccbc2429e3d01a4d963ed3f2 100644 (file)
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -228,7 +228,6 @@ export QA_RPATHS=$[ 0x0001|0x0002 ]
 %endif
 
 PASSTHRU_CODEC_MODULES="codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr codecs/mod_amrwb"
-SPIDERMONKEY_MODULES="languages/mod_spidermonkey languages/mod_spidermonkey_curl languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone"
 APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_directory applications/mod_fsv applications/mod_lcr applications/mod_easyroute applications/mod_stress applications/mod_vmd applications/mod_limit applications/mod_soundtouch applications/mod_fax"
 CODECS_MODULES="codecs/mod_ilbc codecs/mod_h26x codecs/mod_voipcodecs codecs/mod_speex codecs/mod_celt codecs/mod_siren codecs/mod_bv"
 DIALPLANS_MODULES="dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml"
@@ -237,13 +236,13 @@ ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_porta
 ASR_TTS_MODULES="asr_tts/mod_pocketsphinx asr_tts/mod_flite asr_tts/mod_unimrcp"
 EVENT_HANDLERS_MODULES="event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv"
 FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_shout"
-LANGUAGES_MODULES="languages/mod_perl languages/mod_lua languages/mod_python"
+LANGUAGES_MODULES="languages/mod_spidermonkey languages/mod_perl languages/mod_lua languages/mod_python"
 LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog"
 SAY_MODULES="say/mod_say_en say/mod_say_de say/mod_say_fr"
 TIMERS_MODULES=
-DISABLED_MODULES="applications/mod_soundtouch languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf languages/mod_managed languages/mod_java say/mod_say_it say/mod_say_es say/mod_say_nl languages/mod_yaml"
+DISABLED_MODULES="applications/mod_soundtouch asr_tts/mod_cepstral asr_tts/mod_lumenvox event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf languages/mod_managed languages/mod_java say/mod_say_it say/mod_say_es say/mod_say_nl languages/mod_yaml"
 XML_INT_MODULES="xml_int/mod_xml_rpc  xml_int/mod_xml_curl xml_int/mod_xml_cdr "
-MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $ENDPOINTS_MODULES $ASR_TTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES"
+MYMODULES="$PASSTHRU_CODEC_MODULES $APPLICATIONS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $ENDPOINTS_MODULES $ASR_TTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES"
 
 export MODULES=$MYMODULES
 test ! -f  modules.conf || rm -f modules.conf

diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index f5146a820769596876046f6a2dfa0c0832b9ffd2..a2aeb82b7a411580d7cb1ee5bce439514f721527 100644 (file)
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -35,11 +35,6 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
        fi; \
        test -z "$$fail" ;
 
-JS_DIR=$(switch_srcdir)/libs/js
-JSLA=$(JS_DIR)/libjs.la
-$(JSLA): mod_spidermonkey-all
-mod_spidermonkey_curl-all mod_spidermonkey_teletone-all mod_spidermonkey_core_db-all mod_spidermonkey_socket-all mod_spidermonky_odbc-all mod_spidermonkey_curl-install mod_spidermonkey_teletone-install mod_spidermonkey_core_db-install mod_spidermonkey_socket-install mod_spidermonky_odbc-install: $(JSLA)
-
 .DEFAULT:
        @if test -z "`echo $@ | grep all`"; then  $(MAKE) $(AM_MAKEFLAGS) $@-all ; else echo Unknown target `echo $@ | sed -e 's|-all||'`; exit 1; fi
 

diff --git a/src/mod/languages/mod_spidermonkey/Makefile b/src/mod/languages/mod_spidermonkey/Makefile
deleted file mode 100644 (file)
index f04a177..0000000
--- a/src/mod/languages/mod_spidermonkey/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-WANT_CURL=yes
-
-LOCAL_CFLAGS=
-LOCAL_LDFLAGS=
-LOCAL_LIBADD=
-
-include sm.mak
-
-depend_install: $(DESTDIR)$(libdir)/libjs.la
-
-$(DESTDIR)$(libdir)/libjs.la: $(JSLA)
-       cd $(JS_DIR)/nsprpub/ && $(MAKE) -j1 install && cd $(JS_DIR) && $(MAKE) -j1 install
-

diff --git a/src/mod/languages/mod_spidermonkey/Makefile.am b/src/mod/languages/mod_spidermonkey/Makefile.am
new file mode 100644 (file)
index 0000000..7ec6892
--- /dev/null
+++ b/src/mod/languages/mod_spidermonkey/Makefile.am
@@ -0,0 +1,71 @@
+include $(top_srcdir)/build/modmake.rulesam
+
+MODNAME=mod_spidermonkey
+
+CURL_DIR=$(switch_srcdir)/libs/curl
+CURL_BUILDDIR=$(switch_builddir)/libs/curl
+CURLLA=${switch_builddir}/libs/curl/lib/libcurl.la
+
+JS_DIR=$(switch_srcdir)/libs/js
+JS_BUILDDIR=$(switch_builddir)/libs/js
+JSLA=$(JS_BUILDDIR)/libjs.la
+
+AM_CFLAGS  += -I. -I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr
+AM_CFLAGS  += -DXP_UNIX  -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1
+AM_LIBADD   = $(switch_builddir)/libfreeswitch.la $(JSLA)
+AM_LDFLAGS += -avoid-version -module -no-undefined -shared 
+AM_LDFLAGS += -L$(JS_BUILDDIR)/nsprpub/dist/lib -lnspr4 $(JS_BUILDDIR)/nsprpub/pr/src/libnspr4.*
+BUILT_SOURCES = $(JSLA) $(LIBCURL_DEPS)
+
+mod_LTLIBRARIES              = mod_spidermonkey.la 
+mod_spidermonkey_la_SOURCES  = mod_spidermonkey.c
+mod_spidermonkey_la_CFLAGS   = $(AM_CFLAGS) $(LIBCURL_CPPFLAGS)
+mod_spidermonkey_la_LIBADD   = $(AM_LIBADD)
+mod_spidermonkey_la_LDFLAGS  = $(AM_LDFLAGS) $(LIBCURL)
+
+mod_LTLIBRARIES             += mod_spidermonkey_curl.la
+mod_spidermonkey_curl_la_SOURCES  = mod_spidermonkey_curl.c
+mod_spidermonkey_curl_la_CFLAGS   = $(AM_CFLAGS) $(LIBCURL_CPPFLAGS)
+mod_spidermonkey_curl_la_LIBADD   = $(AM_LIBADD)
+mod_spidermonkey_curl_la_LDFLAGS  = $(AM_LDFLAGS) $(LIBCURL)
+
+mod_LTLIBRARIES             += mod_spidermonkey_socket.la
+mod_spidermonkey_socket_la_SOURCES  = mod_spidermonkey_socket.c
+mod_spidermonkey_socket_la_CFLAGS   = $(AM_CFLAGS)
+mod_spidermonkey_socket_la_LIBADD   = $(AM_LIBADD)
+mod_spidermonkey_socket_la_LDFLAGS  = $(AM_LDFLAGS)
+
+mod_LTLIBRARIES             += mod_spidermonkey_core_db.la 
+mod_spidermonkey_core_db_la_SOURCES  = mod_spidermonkey_core_db.c
+mod_spidermonkey_core_db_la_CFLAGS   = $(AM_CFLAGS)
+mod_spidermonkey_core_db_la_LIBADD   = $(AM_LIBADD)
+mod_spidermonkey_core_db_la_LDFLAGS  = $(AM_LDFLAGS)
+
+mod_LTLIBRARIES             += mod_spidermonkey_teletone.la
+mod_spidermonkey_teletone_la_SOURCES  = mod_spidermonkey_teletone.c
+mod_spidermonkey_teletone_la_CFLAGS   = $(AM_CFLAGS) -I$(switch_srcdir)/libs/libteletone/src
+mod_spidermonkey_teletone_la_LIBADD   = $(AM_LIBADD)
+mod_spidermonkey_teletone_la_LDFLAGS  = $(AM_LDFLAGS)
+
+if HAVE_ODBC
+mod_LTLIBRARIES             += mod_spidermonkey_odbc.la
+mod_spidermonkey_odbc_la_SOURCES  = mod_spidermonkey_odbc.c
+mod_spidermonkey_odbc_la_CFLAGS   = $(AM_CFLAGS)
+mod_spidermonkey_odbc_la_LIBADD   = $(AM_LIBADD)
+mod_spidermonkey_odbc_la_LDFLAGS  = $(AM_LDFLAGS)
+endif
+
+$(SOURCES): $(BUILT_SOURCES)
+
+$(JSLA): $(JS_DIR) $(JS_DIR)/.update
+       cd $(JS_BUILDDIR)/nsprpub && $(MAKE) -j1 && cd $(JS_BUILDDIR) && $(MAKE)
+       $(TOUCH_TARGET)
+
+$(CURLLA):
+       @cd $(CURL_BUILDDIR) && $(MAKE)
+       $(TOUCH_TARGET)
+
+install-exec-local: $(DESTDIR)$(libdir)/libjs.la
+
+$(DESTDIR)$(libdir)/libjs.la: $(JSLA)
+       cd $(JS_BUILDDIR)/nsprpub/ && $(MAKE) -j1 install && cd $(JS_BUILDDIR) && $(MAKE) install

diff --git a/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj

diff --git a/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.c
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.c

diff --git a/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj

diff --git a/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj

diff --git a/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c

diff --git a/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj

diff --git a/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj

diff --git a/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.c
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.c

diff --git a/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj

diff --git a/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_skel.c
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_skel.c

diff --git a/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj

diff --git a/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.c
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.c

diff --git a/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj

diff --git a/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj

diff --git a/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.c
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.c

diff --git a/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj
similarity index 100%
rename from src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj
rename to src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj

diff --git a/src/mod/languages/mod_spidermonkey/sm.mak b/src/mod/languages/mod_spidermonkey/sm.mak
deleted file mode 100644 (file)
index 25c64a4..0000000
--- a/src/mod/languages/mod_spidermonkey/sm.mak
+++ /dev/null
@@ -1,13 +0,0 @@
-switch_srcdir=../../../..
-JS_DIR=$(switch_srcdir)/libs/js
-JSLA=$(JS_DIR)/libjs.la
-
-LOCAL_CFLAGS+=-I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr  -DXP_UNIX -I../mod_spidermonkey  -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1
-LOCAL_LDFLAGS_POST=-L$(JS_DIR)/nsprpub/dist/lib -lnspr4 $(JS_DIR)/nsprpub/pr/src/libnspr4.*
-LOCAL_LIBADD+=$(JSLA)
-
-include $(switch_srcdir)/build/modmake.rules
-
-$(JSLA): $(JS_DIR) $(JS_DIR)/.update
-       cd $(JS_DIR)/nsprpub && $(MAKE) -j1 && cd $(JS_DIR) && $(MAKE) -j1
-       $(TOUCH_TARGET)

diff --git a/src/mod/languages/mod_spidermonkey_core_db/Makefile b/src/mod/languages/mod_spidermonkey_core_db/Makefile
deleted file mode 100644 (file)
index 1426e33..0000000
--- a/src/mod/languages/mod_spidermonkey_core_db/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-switch_srcdir=../../../..
-LOCAL_CFLAGS=
-LOCAL_LDFLAGS=
-LOCAL_LIBADD=
-include ../mod_spidermonkey/sm.mak
-

diff --git a/src/mod/languages/mod_spidermonkey_curl/Makefile b/src/mod/languages/mod_spidermonkey_curl/Makefile
deleted file mode 100644 (file)
index c5513eb..0000000
--- a/src/mod/languages/mod_spidermonkey_curl/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-WANT_CURL=yes
-include ../mod_spidermonkey/sm.mak

diff --git a/src/mod/languages/mod_spidermonkey_odbc/Makefile b/src/mod/languages/mod_spidermonkey_odbc/Makefile
deleted file mode 100644 (file)
index e53aaf4..0000000
--- a/src/mod/languages/mod_spidermonkey_odbc/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-switch_srcdir=../../../..
-
-include ../mod_spidermonkey/sm.mak
-

diff --git a/src/mod/languages/mod_spidermonkey_skel/Makefile b/src/mod/languages/mod_spidermonkey_skel/Makefile
deleted file mode 100644 (file)
index 2734c21..0000000
--- a/src/mod/languages/mod_spidermonkey_skel/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-
-switch_srcdir=../../../..
-LOCAL_CFLAGS=
-LOCAL_LDFLAGS=
-LOCAL_LIBADD=
-include ../mod_spidermonkey/sm.mak
-

diff --git a/src/mod/languages/mod_spidermonkey_socket/Makefile b/src/mod/languages/mod_spidermonkey_socket/Makefile
deleted file mode 100644 (file)
index e53aaf4..0000000
--- a/src/mod/languages/mod_spidermonkey_socket/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-switch_srcdir=../../../..
-
-include ../mod_spidermonkey/sm.mak
-

diff --git a/src/mod/languages/mod_spidermonkey_teletone/Makefile b/src/mod/languages/mod_spidermonkey_teletone/Makefile
deleted file mode 100644 (file)
index f781c1c..0000000
--- a/src/mod/languages/mod_spidermonkey_teletone/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-switch_srcdir=../../../..
-LOCAL_CFLAGS=-I$(switch_srcdir)/libs/libteletone/src
-include ../mod_spidermonkey/sm.mak
-