From cd9ce057ea1b062ef37dbefe1e0006dbbd43cacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Monrouzeau?= Date: Tue, 12 Jul 2016 13:33:21 +0200 Subject: [PATCH] JSONRPC Changed Makefile option location --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2325c87..24b3bc3 100644 --- a/Makefile +++ b/Makefile @@ -30,15 +30,12 @@ endif ifneq ("$(NOHTTP)", "") CFLAGS+=-DKORE_NO_HTTP + ifneq ("$(JSONRPC)", "") + $(error "JSONRPC support needs HTTP") + endif else S_SRC+= src/auth.c src/accesslog.c src/http.c \ src/validator.c src/websocket.c - ifneq ("$(JSONRPC)", "") - S_SRC+=src/jsonrpc.c - LDFLAGS+=-lyajl - CFLAGS+=-DKORE_USE_JSONRPC - endif - endif ifneq ("$(NOTLS)", "") @@ -63,6 +60,12 @@ ifneq ("$(TASKS)", "") CFLAGS+=-DKORE_USE_TASKS endif +ifneq ("$(JSONRPC)", "") + S_SRC+=src/jsonrpc.c + LDFLAGS+=-lyajl + CFLAGS+=-DKORE_USE_JSONRPC +endif + OSNAME=$(shell uname -s | sed -e 's/[-_].*//g' | tr A-Z a-z) ifeq ("$(OSNAME)", "darwin") CFLAGS+=-I/opt/local/include/ -I/usr/local/opt/openssl/include