From 04ff0684fc44d8feaa081dd657a6b7d03fc15721 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 21 Apr 2017 16:00:33 -0400 Subject: [PATCH 3/5] Don't set MAKE. This will override the actual make command used for recursive invocations, which is not what we want. --- Makefile | 5 ++--- lib/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9401cf0..0be39b6 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,6 @@ VERSION_MINOR = 3 AR ?= $(CROSS_COMPILE)ar CC ?= $(CROSS_COMPILE)gcc LD ?= $(CROSS_COMPILE)ld -MAKE = make RM = rm -f INSTALL = install @@ -94,7 +93,7 @@ help: $(SRC_LIBDIR)/libfmap.a: - @$(MAKE) -C $(SRC_LIBDIR) + $(MAKE) -C $(SRC_LIBDIR) $(SHARED_OBJ_FILE): $(SRC_LIBDIR)/libfmap.a $(CC) $(CFLAGS) $(LINKOPTS) -shared -Wl,-soname,$(SHARED_OBJ_SONAME) -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive @@ -215,7 +214,7 @@ lcov-clean: clean: lcov-clean rm -f *.o *.a $(PROGRAMS) $(TEST_PROGRAM) $(LIBFMAP_EXAMPLE) $(SHARED_OBJ_FILE) - @$(MAKE) -C $(SRC_LIBDIR) clean + $(MAKE) -C $(SRC_LIBDIR) clean %.o: %.c $(CC) $(ALL_CFLAGS) -c $^ -I. -o $@ diff --git a/lib/Makefile b/lib/Makefile index 7d02dcb..5aef1b0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -48,10 +48,10 @@ export MY_CFLAGS .PHONY: clean clean: rm -f *.o *.a - @$(MAKE) -C $(MINCRYPT) clean + $(MAKE) -C $(MINCRYPT) clean $(MINCRYPT)/sha.o: - @$(MAKE) -C $(MINCRYPT) + $(MAKE) -C $(MINCRYPT) libfmap.a: $(OBJS) $(DEPS) $(AR) rcs $@ $+ -- 2.10.2