From 93d2a5841e21e5f7a3305156d8d7da531fd47f67 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Fri, 14 Nov 2014 02:36:04 +0100
Subject: m makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b32460b..640ce35 100644
--- a/Makefile
+++ b/Makefile
@@ -89,11 +89,10 @@ WARN = -Wall -Wextra -pedantic -Wdouble-promotion -Wformat=2 -Winit-self       \
 
 
 # Flags to use when compiling
-CXX_FLAGS = $(foreach D,$(DEFS),-D$(D)) -std=$(STD) \
-            $(OPTIMISE) $(CXXFLAGS) $(PIC) $(CPPFLAGS) $(WARN)
+CXX_FLAGS = $(foreach D,$(DEFS),-D$(D)) -std=$(STD) $(OPTIMISE) $(PIC) $(WARN)
 
 # Flags to use when linking
-LD_FLAGS = -lgamma -std=$(STD) $(OPTIMISE) $(LDFLAGS) $(WARN)
+LD_FLAGS = -lgamma -std=$(STD) $(OPTIMISE) $(WARN)
 
 
 # Header files
@@ -119,11 +118,11 @@ bin/libgammamm.$(SO):
 	ln -sf libgammamm.$(SO).$(LIB_VERSION) $@
 
 bin/test: obj/test.o obj/libgamma-error.o obj/libgamma-facade.o obj/libgamma-method.o
-	$(CXX) $(LD_FLAGS) -o $@ $^
+	$(CXX) $(LD_FLAGS) -o $@ $^ $(LDFLAGS)
 
 obj/%.o: src/%.cc src/*.hh
 	@mkdir -p obj
-	$(CXX) $(CXX_FLAGS) -c -o $@ $<
+	$(CXX) $(CXX_FLAGS) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS)
 
 
 
-- 
cgit v1.2.3-70-g09d2