From 4c57f0aa5b623c6cee48f751957022be228ace21 Mon Sep 17 00:00:00 2001 From: Shane Bryldt Date: Thu, 28 Sep 2017 17:53:56 -0500 Subject: [PATCH] FS-10690: Added support for compiling civetweb inline when building libblade --- libs/libblade/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/libblade/Makefile.am b/libs/libblade/Makefile.am index d3f090579c..6cd793d95c 100644 --- a/libs/libblade/Makefile.am +++ b/libs/libblade/Makefile.am @@ -6,6 +6,7 @@ AUTOMAKE_OPTIONS = subdir-objects CIVETWEB_VERSION=1.9.1 CIVETWEB=civetweb-$(CIVETWEB_VERSION) CIVETWEB_DIR=$(top_srcdir)/../$(CIVETWEB) +CIVETWEB_LIB=$(top_srcdir)/../$(CIVETWEB)/libcivetweb.a AM_CFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/src/include -I$(CIVETWEB_DIR)/include AM_LDFLAGS += -L$(CIVETWEB_DIR) @@ -36,10 +37,13 @@ library_include_HEADERS += src/include/blade_protocol.h src/include/blade_subscr library_include_HEADERS += src/include/blade_transport.h src/include/blade_transport_wss.h library_include_HEADERS += src/include/unqlite.h test/tap.h -BUILT_SOURCES=$(CIVETWEB_DIR) +BUILT_SOURCES=$(CIVETWEB_LIB) + +$(CIVETWEB_LIB): $(CIVETWEB_DIR) + cd $(CIVETWEB_DIR) && $(MAKE) lib USE_STACK_SIZE=102400 MAX_REQUEST_SIZE=16384 WITH_LUA=1 LUA_COMPAT_ALL=1 USE_LUA_SQLITE3=1 USE_LUA_FILE_SYSTEM=1 WITH_IPV6=1 WITH_WEBSOCKET=1 && $(MAKE) lib USE_STACK_SIZE=102400 MAX_REQUEST_SIZE=16384 WITH_LUA=1 LUA_COMPAT_ALL=1 USE_LUA_SQLITE3=1 USE_LUA_FILE_SYSTEM=1 WITH_IPV6=1 WITH_WEBSOCKET=1 WITH_DUKTAPE=1 $(CIVETWEB_DIR): - $(GETLIB) $(CIVETWEB).tar.gz + $(GETLIB) $(CIVETWEB).tar.gz tests: libblade.la $(MAKE) -C test tests