Modified in order to definitively solve problems with ruby wrapper

Sebastiano Merlino · Sebastiano Merlino · commit bae8e0150908 · 2012-03-03T23:01:52.000+01:00
diff --git a/src/HttpEndpoint.cpp b/src/HttpEndpoint.cpp
@@ -17,7 +17,6 @@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
-#include <regex.h>
 #include "HttpEndpoint.hpp"
 #include "HttpUtils.hpp"
 #include "string_utilities.hpp"
diff --git a/src/httpserver/Webserver.hpp b/src/httpserver/Webserver.hpp
@@ -26,6 +26,12 @@
 %include "exception.i"
 %include "stl.i"
 %include "std_map.i"
+%include "HttpUtils.hpp"
+%include "HttpRequest.hpp"
+%include "HttpResponse.hpp"
+%include "HttpResource.hpp"
+%include "HttpEndpoint.hpp"
+%include "Webserver.hpp"
 
 namespace std {
 	%template(StringVector) vector<std::string>;
@@ -119,8 +125,6 @@ namespace std {
 	}
 #endif
 
-%include "HttpUtils.hpp"
-
 %template(SQMHeaders) std::map<std::string, std::string>;    
 
 %extend std::map<std::string, std::string> {
@@ -173,6 +177,7 @@ namespace std {
 #include "HttpUtils.hpp"
 #include "HttpRequest.hpp"
 #include "HttpResponse.hpp"
+#include "HttpResource.hpp"
 #include "HttpEndpoint.hpp"
 #include "Webserver.hpp"
 %}
@@ -197,7 +202,6 @@ namespace std {
 #include <vector>
 #include <string>
 #include <utility>
-#include <regex.h>
 #include <memory>
 //#include <boost/xpressive/xpressive.hpp>
 
diff --git a/src/httpserver/string_utilities.hpp b/src/httpserver/string_utilities.hpp
@@ -22,7 +22,6 @@
 
 #include <string>
 #include <vector>
-#include <regex.h>
 
 namespace httpserver
 {
diff --git a/src/ruby/Makefile.am b/src/ruby/Makefile.am
@@ -16,14 +16,18 @@
 #     License along with this library; if not, write to the Free Software
 #     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDES = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver $(RUBYINCLUDES)
-AM_CPPFLAGS=$(RUBYDEFINES)
 METASOURCES = AUTO
 lib_LTLIBRARIES = libhttpserver_ruby.la
-libhttpserver_ruby_la_LIBADD = -lmicrohttpd
-libhttpserver_ruby_la_SOURCES = WebserverWrap.cpp $(top_srcdir)/src/Webserver.cpp $(top_srcdir)/src/HttpUtils.cpp $(top_srcdir)/src/HttpEndpoint.cpp $(top_srcdir)/src/HttpResource.cpp $(top_srcdir)/src/HttpRequest.cpp $(top_srcdir)/src/HttpResponse.cpp $(top_srcdir)/src/string_utilities.cpp
+noinst_LIBRARIES = libHttpEndpoint.a libstring_utilities.a
+libHttpEndpoint_a_SOURCES = $(top_srcdir)/src/HttpEndpoint.cpp
+libHttpEndpoint_a_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
+libstring_utilities_a_SOURCES = $(top_srcdir)/src/string_utilities.cpp
+libstring_utilities_a_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
+libhttpserver_ruby_la_LIBADD = -lmicrohttpd libHttpEndpoint.a libstring_utilities.a
+libhttpserver_ruby_la_SOURCES = WebserverWrap.cpp $(top_srcdir)/src/Webserver.cpp $(top_srcdir)/src/HttpUtils.cpp $(top_srcdir)/src/HttpResource.cpp $(top_srcdir)/src/HttpRequest.cpp $(top_srcdir)/src/HttpResponse.cpp
+libhttpserver_ruby_la_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver $(RUBYINCLUDES) $(RUBYDEFINES)
 libhttpserver_ruby_la_includedir = 
-libhttpserver_ruby_la_include_HEADERS = libhttpserver_ruby.rb
+libhttpserver_ruby_la_include_HEADERS =
 
 language=ruby
 swigoptions=-minherit -Wall

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`
`23`	`23`	`#include <string>`
`24`	`24`	`#include <vector>`
`25`		`-#include <regex.h>`
`26`	`25`
`27`	`26`	`namespace httpserver`
`28`	`27`	`{`