Fixed merge conflict

1 files changed, 4 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 179ba7c..8a7ed87 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,14 @@ all: sender receiver
 
 INCLUDES=/usr/local/include
 LIBS=/usr/local/lib
+CXXFLAGS=-Wall
+LDFLAGS=-lmbedtls -lmbedcrypto
 
 sender: sender.c
-        $(CC) -o sender sender.c -lmbedtls -lmbedcrypto -I$(INCLUDES) -L$(LIBS)
+        $(CC) -o sender sender.c $(LDFLAGS) -I$(INCLUDES) -L$(LIBS)
 
 receiver: receiver.cpp
-        $(CXX) -std=c++17 -o receiver receiver.cpp -lmbedtls -lmbedcrypto -I$(INCLUDES) -L$(LIBS)
+        $(CXX) -std=c++17 -o receiver receiver.cpp $(LDFLAGS) -I$(INCLUDES) -L$(LIBS) $(CXXFLAGS)
 
 test: receiver sender
         ./test-all.sh