diff --git a/Makefile b/Makefile
index 4a02198..fb7817a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,10 @@
-CC			:= gcc
-CXX			:= g++
-AR			:= ar
+CC		:= gcc
+CXX		:= g++
+AR		:= ar
+
+DIST_CFLAGS	:= $(CFLAGS)
+DIST_CXXFLAGS	:= $(CXXFLAGS)
+
 COMMONFLAGS	= -fsanitize=address
 CFLAGS		= -fPIC $(COMMONFLAGS) -I./pclsync -I/usr/include
 ifneq (,$(filter clang%,$(CC)))
@@ -41,6 +45,11 @@ else
     $(error Invalid BUILD. Use 'debug' or 'release')
 endif
 
+CFLAGS		+= $(DIST_CFLAGS)
+CXXFLAGS	+= $(DIST_CXXFLAGS)
+LIBLDFLAGS	+= $(LDFLAGS)
+EXECLDFLAGS	+= $(LDFLAGS)
+
 ifeq ($(SCAN), 1)
 	CC := scan-build -o scanresults $(CC)
 	CXX := scan-build -o scanresults $(CXX)