From 71d813af3e71ccebfac1c842c5075f9ad11a9ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 13 Sep 2020 18:20:15 -0300
Subject: [PATCH] Switch to single makefile.

---
 extern/libbaseencode/makefile |  5 -----
 makefile                      | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 extern/libbaseencode/makefile

diff --git a/extern/libbaseencode/makefile b/extern/libbaseencode/makefile
deleted file mode 100644
index 3014948..0000000
--- a/extern/libbaseencode/makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-baseencode.a: base32.o base64.o
-	$(AR) r $@ $^
-
-clean:
-	rm -f baseencode.a base32.o base64.o
diff --git a/makefile b/makefile
index afb633d..62715e4 100644
--- a/makefile
+++ b/makefile
@@ -1,10 +1,14 @@
 INC = -Iextern
-CFLAGS = -O2 -g -pipe -Wall -Wextra $(INC)
+OPT = -O2
+WARN = -Wall -Wextra
+CFLAGS = $(OPT) -g -pipe
 LDLIBS = -lbearssl -lsbearssl -lskarnet
 LDFLAGS = -Wl,--as-needed
 
 BASEENCODE = extern/libbaseencode/baseencode.a
+BASEENCODEOBJS = extern/libbaseencode/base64.o extern/libbaseencode/base32.o
 LIBS = $(BASEENCODE)
+LIBSOBJS = $(BASEENCODEOBJS)
 
 FINAL = purr
 OBJS = purr.o socket.o urls.o files.o comm.o formats.o encrypt.o
@@ -18,12 +22,13 @@ check: $(TEST)
 	./tests
 
 $(OBJS): purr.h
+$(OBJS): CFLAGS += $(WARN) $(INC)
 purr: $(OBJS) $(LIBS)
 tests: $(TOBJS) $(LIBS)
 
-$(BASEENCODE):
-	make -C extern/libbaseencode
+$(BASEENCODEOBJS): extern/libbaseencode/common.h extern/libbaseencode/baseencode.h
+$(BASEENCODE): $(BASEENCODEOBJS)
+	$(AR) r $@ $^
 
 clean:
-	rm -f $(FINAL) $(OBJS) $(TEST) $(TOBJS)
-	make -C extern/libbaseencode clean
+	rm -f $(FINAL) $(OBJS) $(TEST) $(TOBJS) $(LIBS) $(LIBSOBJS)