From 25a9b5d4cd1b57c81e697ff7e54bf9121e8bbfa4 Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Mon, 27 May 2013 22:36:39 +0200
Subject: [PATCH 2/2] MEDIUM: Respect CFLAGS and LDFLAGS

---
 flx/Makefile       | 4 ++--
 include/rules.make | 5 ++---
 signfs/Makefile    | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/flx/Makefile b/flx/Makefile
index 408c9b5..09e25b4 100644
--- a/flx/Makefile
+++ b/flx/Makefile
@@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \
     output.c output_file.c
 OBJ=$(SRC:.c=.o)
 COPTS=-O2 -fno-strict-aliasing
-CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE
-LDFLAGS=-L. -Wl,--gc-sections
+CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE
+LDFLAGS += -L. -Wl,--gc-sections
 
 all:	$(NAME)
 
diff --git a/include/rules.make b/include/rules.make
index f373aad..02240e0 100644
--- a/include/rules.make
+++ b/include/rules.make
@@ -1,8 +1,7 @@
 CC      ?= gcc
 
-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
-#-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
-LDFLAGS=-Wl,--gc-sections
+CFLAGS  += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
+LDFLAGS += -Wl,--gc-sections
 
 all:	$(OBJS)
 
diff --git a/signfs/Makefile b/signfs/Makefile
index d4214c6..ab03992 100644
--- a/signfs/Makefile
+++ b/signfs/Makefile
@@ -29,8 +29,8 @@ NAME=signfs
 SRC=main.c signfs.c structure.c
 OBJ=$(SRC:.c=.o)
 COPTS=-Os -march=i386
-CFLAGS=$(COPTS) -Wall
-LDFLAGS=-L. -ltools
+CFLAGS  += -Wall
+LDFLAGS += -L. -ltools
 LIBTOOLS=md5.c libtools.c others.c
 
 $(NAME): libtools.a $(OBJ)