Rename libb64 to b64 for compatibility reasons, move to DEPS.

master
Andriy Senkovych 11 years ago
parent 46e872a090
commit 8deffc7403

@ -1,6 +1,7 @@
OUT=webdis
HIREDIS_OBJ=hiredis/hiredis.o hiredis/sds.o hiredis/net.o hiredis/async.o
JANSSON_OBJ=jansson/src/dump.o jansson/src/error.o jansson/src/hashtable.o jansson/src/load.o jansson/src/strbuffer.o jansson/src/utf.o jansson/src/value.o jansson/src/variadic.o
B64_OBJS=b64/cencode.o
FORMAT_OBJS=formats/json.o formats/raw.o formats/common.o formats/custom-type.o
HTTP_PARSER_OBJS=http-parser/http_parser.o
@ -16,8 +17,8 @@ ifneq ($(strip $(MSGPACK_LIB)),)
endif
DEPS=$(FORMAT_OBJS) $(HIREDIS_OBJ) $(JANSSON_OBJ) $(HTTP_PARSER_OBJS)
OBJS=webdis.o cmd.o worker.o slog.o server.o libb64/cencode.o acl.o md5/md5.o sha1/sha1.o http.o client.o websocket.o pool.o conf.o $(DEPS)
DEPS=$(FORMAT_OBJS) $(HIREDIS_OBJ) $(JANSSON_OBJ) $(HTTP_PARSER_OBJS) $(B64_OBJS)
OBJS=webdis.o cmd.o worker.o slog.o server.o acl.o md5/md5.o sha1/sha1.o http.o client.o websocket.o pool.o conf.o $(DEPS)

@ -9,7 +9,7 @@
#include <jansson.h>
#include <evhttp.h>
#include <libb64/cencode.h>
#include <b64/cencode.h>
#include "conf.h"
#include "acl.h"

@ -1,5 +1,5 @@
#include "sha1/sha1.h"
#include "libb64/cencode.h"
#include <b64/cencode.h>
#include "websocket.h"
#include "client.h"
#include "cmd.h"

Loading…
Cancel
Save