From 8deffc7403dd2e0017bca6af7e4d261bd1c6e880 Mon Sep 17 00:00:00 2001
From: Andriy Senkovych <jolly_roger@itblog.org.ua>
Date: Mon, 11 Nov 2013 14:51:29 +0200
Subject: [PATCH] Rename libb64 to b64 for compatibility reasons, move to DEPS.

---
 Makefile                  | 5 +++--
 {libb64 => b64}/cencode.c | 0
 {libb64 => b64}/cencode.h | 0
 conf.c                    | 2 +-
 websocket.c               | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename {libb64 => b64}/cencode.c (100%)
 rename {libb64 => b64}/cencode.h (100%)

diff --git a/Makefile b/Makefile
index 910fd38..53b1f4a 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
 
 
 
diff --git a/libb64/cencode.c b/b64/cencode.c
similarity index 100%
rename from libb64/cencode.c
rename to b64/cencode.c
diff --git a/libb64/cencode.h b/b64/cencode.h
similarity index 100%
rename from libb64/cencode.h
rename to b64/cencode.h
diff --git a/conf.c b/conf.c
index 43c6be1..4fce300 100644
--- a/conf.c
+++ b/conf.c
@@ -9,7 +9,7 @@
 
 #include <jansson.h>
 #include <evhttp.h>
-#include <libb64/cencode.h>
+#include <b64/cencode.h>
 #include "conf.h"
 #include "acl.h"
 
diff --git a/websocket.c b/websocket.c
index ff5cd70..9b0223c 100644
--- a/websocket.c
+++ b/websocket.c
@@ -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"