1 From 04ff0684fc44d8feaa081dd657a6b7d03fc15721 Mon Sep 17 00:00:00 2001
2 From: Nick Bowler <nbowler@draconx.ca>
3 Date: Fri, 21 Apr 2017 16:00:33 -0400
4 Subject: [PATCH 3/5] Don't set MAKE.
6 This will override the actual make command used for recursive
7 invocations, which is not what we want.
11 2 files changed, 4 insertions(+), 5 deletions(-)
13 diff --git a/Makefile b/Makefile
14 index 9401cf0..0be39b6 100644
17 @@ -38,7 +38,6 @@ VERSION_MINOR = 3
18 AR ?= $(CROSS_COMPILE)ar
19 CC ?= $(CROSS_COMPILE)gcc
20 LD ?= $(CROSS_COMPILE)ld
25 @@ -94,7 +93,7 @@ help:
28 $(SRC_LIBDIR)/libfmap.a:
29 - @$(MAKE) -C $(SRC_LIBDIR)
30 + $(MAKE) -C $(SRC_LIBDIR)
32 $(SHARED_OBJ_FILE): $(SRC_LIBDIR)/libfmap.a
33 $(CC) $(CFLAGS) $(LINKOPTS) -shared -Wl,-soname,$(SHARED_OBJ_SONAME) -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive
34 @@ -215,7 +214,7 @@ lcov-clean:
37 rm -f *.o *.a $(PROGRAMS) $(TEST_PROGRAM) $(LIBFMAP_EXAMPLE) $(SHARED_OBJ_FILE)
38 - @$(MAKE) -C $(SRC_LIBDIR) clean
39 + $(MAKE) -C $(SRC_LIBDIR) clean
42 $(CC) $(ALL_CFLAGS) -c $^ -I. -o $@
43 diff --git a/lib/Makefile b/lib/Makefile
44 index 7d02dcb..5aef1b0 100644
47 @@ -48,10 +48,10 @@ export MY_CFLAGS
51 - @$(MAKE) -C $(MINCRYPT) clean
52 + $(MAKE) -C $(MINCRYPT) clean
55 - @$(MAKE) -C $(MINCRYPT)
56 + $(MAKE) -C $(MINCRYPT)
58 libfmap.a: $(OBJS) $(DEPS)