Static websockets option.

This commit is contained in:
Roger A. Light 2018-05-18 22:25:09 +01:00
parent 4c9548cc7c
commit d8dc336c24
2 changed files with 12 additions and 6 deletions

View File

@ -241,11 +241,6 @@ ifeq ($(WITH_SRV),yes)
CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_SRV CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_SRV
endif endif
ifeq ($(WITH_WEBSOCKETS),yes)
BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS
BROKER_LIBS:=$(BROKER_LIBS) -lwebsockets
endif
ifeq ($(UNAME),SunOS) ifeq ($(UNAME),SunOS)
BROKER_LIBS:=$(BROKER_LIBS) -lsocket -lnsl BROKER_LIBS:=$(BROKER_LIBS) -lsocket -lnsl
LIB_LIBS:=$(LIB_LIBS) -lsocket -lnsl LIB_LIBS:=$(LIB_LIBS) -lsocket -lnsl
@ -265,6 +260,16 @@ ifeq ($(WITH_DOCS),yes)
MAKE_ALL:=$(MAKE_ALL) docs MAKE_ALL:=$(MAKE_ALL) docs
endif endif
ifeq ($(WITH_WEBSOCKETS),yes)
BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS
BROKER_LIBS:=$(BROKER_LIBS) -lwebsockets
endif
ifeq ($(WITH_WEBSOCKETS),static)
BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS
BROKER_LIBS:=$(BROKER_LIBS) -static -lwebsockets
endif
INSTALL?=install INSTALL?=install
prefix=/usr/local prefix=/usr/local
mandir=${prefix}/share/man mandir=${prefix}/share/man

View File

@ -44,11 +44,12 @@ parts:
mosquitto: mosquitto:
plugin: make plugin: make
make-parameters: ["prefix=/usr", "WITH_SRV=no"] make-parameters: ["prefix=/usr", "WITH_SRV=no", "WITH_WEBSOCKETS=static"]
source: https://github.com/eclipse/mosquitto source: https://github.com/eclipse/mosquitto
source-type: git source-type: git
build-packages: build-packages:
- libwebsockets-dev
- libssl-dev - libssl-dev
- uuid-dev - uuid-dev
- xsltproc - xsltproc