From c5bff0c2f0764742c04b1b903751e65ea4eb0342 Mon Sep 17 00:00:00 2001 From: Michael Uleysky Date: Fri, 25 Sep 2015 09:39:06 +1000 Subject: [PATCH] Add externally defined CFLAGS and LDFLAGS to compiler and linker options. --- Makefile | 4 ++-- src/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5656da5..f57c121 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ CPPFLAGS=-std=gnu++11 -I../include -I../../include LIBSFLAGS= WARNFLAGS=-Wall -CFLAGS=$(OPTFLAGS) $(EXPORTFLAGS) $(WARNFLAGS) $(CPPFLAGS) -LDFLAGS=$(OPTFLAGS) $(EXPORTFLAGS) $(WARNFLAGS) $(LIBSFLAGS) +CFLAGS+=$(OPTFLAGS) $(EXPORTFLAGS) $(WARNFLAGS) $(CPPFLAGS) +LDFLAGS+=$(OPTFLAGS) $(EXPORTFLAGS) $(WARNFLAGS) $(LIBSFLAGS) CC=g++ diff --git a/src/Makefile b/src/Makefile index 24e994b..a33b399 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,8 +5,8 @@ CPPFLAGS=-std=gnu++11 -I../include LIBSFLAGS=-ldl -lpthread $(MODLIBS) WARNFLAGS=-Wall -CFLAGS=$(OPTFLAGS) $(EXPORTFLAGS) $(WARNFLAGS) $(CPPFLAGS) -LDFLAGS=$(OPTFLAGS) $(EXPORTFLAGS) $(WARNFLAGS) $(LIBSFLAGS) +CFLAGS+=$(OPTFLAGS) $(EXPORTFLAGS) $(WARNFLAGS) $(CPPFLAGS) +LDFLAGS+=$(OPTFLAGS) $(EXPORTFLAGS) $(WARNFLAGS) $(LIBSFLAGS) CC=g++