From 5f4d586aca4b5e802e2d18d527ee0b0a4e2f884c Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Fri, 14 Jul 2023 20:08:36 +0200
Subject: Minor changes

---
 Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9606e51..9739ea0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,19 @@
-PUBLISHER_PORT=5556
+CONF=$(PWD)/config.mk
+include $(CONF)
 CC="gcc"
 CFLAGS=
 
 all: publisher client
 
 publisher:
-	echo "Building publisher..."
-	CFLAGS+=-DPUBLISHER_PORT=$(PUBLISHER_PORT) \
-	$(MAKE) -C src/publisher/ CC=$(CC) OUT=$(PWD)
+	@echo "---------- Building publisher..."
+	CFLAGS=$(CFLAGS) \
+	$(MAKE) -C src/publisher/ CC=$(CC) OUT=$(PWD) CONF=$(CONF)
 
 client:
-	echo "Building client..."
-	CFLAGS+=-DPUBLISHER_PORT=$(PUBLISHER_PORT) \
-	$(MAKE) -C src/client/ CC=$(CC) OUT=$(PWD)
+	@echo "---------- Building client..."
+	CFLAGS=$(CFLAGS) \
+	$(MAKE) -C src/client/ CC=$(CC) OUT=$(PWD) CONF=$(CONF)
 
 
 clean:
-- 
cgit v1.2.3