From 55336e98456fa55da2fd975a737c1b40d85eee6e Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 30 Dec 2017 12:41:25 +0100
Subject: Embded libhydrogen as a submodule

---
 Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4656bfd..ff50b37 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
 PREFIX ?= /usr/local
 WFLAGS ?= -Wall -Wextra -Wmissing-prototypes -Wdiv-by-zero -Wbad-function-cast -Wcast-align -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wnested-externs -Wno-unknown-pragmas -Wpointer-arith -Wredundant-decls -Wstrict-prototypes -Wswitch-enum -Wno-type-limits
 CFLAGS ?= -Os -march=native -fno-exceptions $(WFLAGS)
-CFLAGS += -I.
-OBJ = src/encpipe.o src/safe_rw.o
+CFLAGS += -I. -Iext/libhydrogen
+OBJ = ext/libhydrogen/hydrogen.o src/encpipe.o src/safe_rw.o
 AR ?= ar
 RANLIB ?= ranlib
 STRIP ?= strip
 
 SRC = \
+	ext/libhydrogen/hydrogen.c \
 	src/common.h \
 	src/encpipe.c \
 	src/encpipe_p.h \
@@ -19,7 +20,7 @@ all: bin
 bin: encpipe
 
 encpipe: $(OBJ)
-	$(CC) $(CFLAGS) -o encpipe $(OBJ) -lhydrogen
+	$(CC) $(CFLAGS) -o encpipe $(OBJ)
 
 install: bin
 	-$(STRIP) encpipe 2> /dev/null
@@ -31,7 +32,12 @@ uninstall:
 
 $(OBJ): $(SRC)
 
+ext/libhydrogen/hydrogen.c:
+	git submodule update --init
+
 .PHONY: clean
 
 clean:
 	rm -f encpipe $(OBJ)
+
+distclean: clean
-- 
cgit v1.2.3-70-g09d2