1 From 8d90ed7744b23c9f7298f5422f45ea3b033cf91b Mon Sep 17 00:00:00 2001
2 From: Nick Bowler <nbowler@draconx.ca>
3 Date: Fri, 21 Apr 2017 15:45:17 -0400
4 Subject: [PATCH 1/5] Respect CFLAGS/LDFLAGS.
7 Makefile | 19 ++++++++++---------
8 lib/Makefile | 7 ++++---
9 lib/mincrypt/Makefile | 2 +-
10 3 files changed, 15 insertions(+), 13 deletions(-)
12 diff --git a/Makefile b/Makefile
13 index 30253c3..45942c1 100644
16 @@ -61,9 +61,10 @@ pkgconfig_dir = $(libdir)/pkgconfig
18 DEFS = -DVERSION_MAJOR=$(VERSION_MAJOR)\
19 -DVERSION_MINOR=$(VERSION_MINOR)
20 -CFLAGS += -O2 -Wall -Werror -Wno-unused-parameter -Ilib/ $(DEFS)
21 +MY_CFLAGS = -Wall -Wno-unused-parameter -Ilib/ $(DEFS)
22 +ALL_CFLAGS = $(MY_CFLAGS) $(CFLAGS)
23 CFLAGS_GCOV := -fprofile-arcs -ftest-coverage -lgcov
25 +LINKOPTS = $(LDFLAGS)
27 PROGRAMS = fmap_decode fmap_encode fmap_csum libfmap_example
28 TEST_PROGRAM = fmap_test
29 @@ -78,7 +79,7 @@ SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -
31 RELEASENAME := $(PACKAGE_NAME)-$(VERSION_MAJOR).$(VERSION_MINOR)-r$(SVNVERSION)
36 all: $(PROGRAMS) $(SHARED_OBJ_FILE)
38 @@ -97,19 +98,19 @@ $(SRC_LIBDIR)/libfmap.a:
39 ar rcs $@ $(SRC_LIBDIR)/*.o
41 $(SHARED_OBJ_FILE): $(SRC_LIBDIR)/libfmap.a
42 - $(CC) -fpic -shared -Wl,-soname,$(SHARED_OBJ_SONAME) -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive
43 + $(CC) $(CFLAGS) $(LINKOPTS) -shared -Wl,-soname,$(SHARED_OBJ_SONAME) -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive
45 $(PROGRAMS): $(SRC_LIBDIR)/libfmap.a
46 - $(CC) $(CFLAGS) $(LINKOPTS) -I. -o $@ $@.c $^
47 + $(CC) $(ALL_CFLAGS) $(LINKOPTS) -I. -o $@ $@.c $^
49 # Add shared object filename to gcc command in case it's not installed already
50 $(LIBFMAP_EXAMPLE): $(SHARED_OBJ_FILE)
51 - $(CC) $(CFLAGS) $(LINKOPTS) -o $@ $@.c $(SHARED_OBJ_FILE)
52 + $(CC) $(ALL_CFLAGS) $(LINKOPTS) -o $@ $@.c $(SHARED_OBJ_FILE)
54 $(TEST_PROGRAM): $(SRC_LIBDIR)/libfmap.a
55 - $(CC) $(CFLAGS) $(LINKOPTS) -I. -o $@ $@.c $^
56 + $(CC) $(ALL_CFLAGS) $(LINKOPTS) -I. -o $@ $@.c $^
58 -test: CFLAGS += $(CFLAGS_GCOV)
59 +test: MY_CFLAGS += $(CFLAGS_GCOV)
61 lcov --directory . --zerocounters
62 @echo "Running $(TEST_PROGRAM)"
63 @@ -218,4 +219,4 @@ clean: lcov-clean
64 @$(MAKE) -C $(SRC_LIBDIR) clean
67 - $(CC) $(CFLAGS) -c $^ -I. -o $@
68 + $(CC) $(ALL_CFLAGS) -c $^ -I. -o $@
69 diff --git a/lib/Makefile b/lib/Makefile
70 index abd7ef8..bb65449 100644
73 @@ -41,8 +41,9 @@ DEPS = $(MINCRYPT)/sha.o
74 INPUT_OBJS = input_interactive.o input_kv_pair.o
80 +ALL_CFLAGS = $(MY_CFLAGS) $(CFLAGS)
85 @@ -56,4 +57,4 @@ libfmap.a: $(OBJS) $(DEPS)
89 - $(CC) $(CFLAGS) -c $^ -I. -I$(INCLUDES) -o $@
90 + $(CC) $(ALL_CFLAGS) -c $^ -I. -I$(INCLUDES) -o $@
91 diff --git a/lib/mincrypt/Makefile b/lib/mincrypt/Makefile
92 index 6229ec0..6f54faf 100644
93 --- a/lib/mincrypt/Makefile
94 +++ b/lib/mincrypt/Makefile
95 @@ -38,4 +38,4 @@ clean:
99 - $(CC) $(CFLAGS) -c $^ -I. -o $@
100 + $(CC) $(MY_CFLAGS) $(CFLAGS) -c $^ -I. -o $@