diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-11-14 02:36:04 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-11-14 02:36:04 +0100 |
| commit | 93d2a5841e21e5f7a3305156d8d7da531fd47f67 (patch) | |
| tree | 5a113c17b66272035f32d1448e783c734b32156c | |
| parent | m (diff) | |
| download | libgammamm-93d2a5841e21e5f7a3305156d8d7da531fd47f67.tar.gz libgammamm-93d2a5841e21e5f7a3305156d8d7da531fd47f67.tar.bz2 libgammamm-93d2a5841e21e5f7a3305156d8d7da531fd47f67.tar.xz | |
m makefile1.0.1
Signed-off-by: Mattias Andrée <maandree@operamail.com>
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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) |