[PATCH] use $(MAKE) rather than make

[PATCH] use $(MAKE) rather than make

[Mike Frysinger]

If you execute straight `make`, this prevents the active make env from
being passed on to sub children.  This prevents parallel building as well
as build flag passing.

I also dropped the recursive make in ubi-utils/Makefile for the all target
as this causes problems when building in parallel.  All of the targets
that we actually care about are handled by the $(NTARGETS) target anyways.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Makefile           |   12 ++++++------
 ubi-utils/Makefile |    5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 2000b17..796c31b 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@ $(BUILDDIR)/%.o: %.c
 .SUFFIXES:
 
 all: $(TARGETS)
-	make -C $(BUILDDIR)/ubi-utils
-	make -C $(BUILDDIR)/mkfs.ubifs
+	$(MAKE) -C $(BUILDDIR)/ubi-utils
+	$(MAKE) -C $(BUILDDIR)/mkfs.ubifs
 
 IGNORE=${wildcard $(BUILDDIR)/.*.c.dep}
 -include ${IGNORE}
@@ -56,8 +56,8 @@ IGNORE=${wildcard $(BUILDDIR)/.*.c.dep}
 clean:
 	rm -f $(BUILDDIR)/*.o $(TARGETS) $(BUILDDIR)/.*.c.dep $(SYMLINKS)
 	if [ "$(BUILDDIR)x" != ".x" ]; then rm -rf $(BUILDDIR); fi
-	make -C $(BUILDDIR)/ubi-utils clean
-	make -C $(BUILDDIR)/mkfs.ubifs clean
+	$(MAKE) -C $(BUILDDIR)/ubi-utils clean
+	$(MAKE) -C $(BUILDDIR)/mkfs.ubifs clean
 
 $(SYMLINKS):
 	ln -sf ../fs/jffs2/$@ $@
@@ -99,5 +99,5 @@ install: ${TARGETS}
 	install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/
 	mkdir -p ${DESTDIR}/${MANDIR}/man1
 	gzip -9c mkfs.jffs2.1 > ${DESTDIR}/${MANDIR}/man1/mkfs.jffs2.1.gz
-	make -C $(BUILDDIR)/ubi-utils install
-	make -C $(BUILDDIR)/mkfs.ubifs install
+	$(MAKE) -C $(BUILDDIR)/ubi-utils install
+	$(MAKE) -C $(BUILDDIR)/mkfs.ubifs install
diff --git a/ubi-utils/Makefile b/ubi-utils/Makefile
index 3e6203f..4cca316 100644
--- a/ubi-utils/Makefile
+++ b/ubi-utils/Makefile
@@ -30,18 +30,17 @@ vpath   %.c ./src
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< -g -Wp,-MD,.$(shell basename $<).dep
 
 all: $(TARGETS)
-	make -C new-utils
 
 IGNORE=${wildcard .*.c.dep}
 -include ${IGNORE}
 
 $(NTARGETS):
-	make -C new-utils $@
+	$(MAKE) -C new-utils $@
 	mv new-utils/$@ $@
 
 clean:
 	rm -rf *.o $(TARGETS) .*.c.dep
-	make -C new-utils clean
+	$(MAKE) -C new-utils clean
 
 pddcustomize: pddcustomize.o error.o libubimirror.o bootenv.o hashmap.o \
 		libubi.o crc32.o
-- 
1.5.6.5

Re: [PATCH] use $(MAKE) rather than make

[Artem Bityutskiy]

On Wed, 2008-08-20 at 13:52 -0400, Mike Frysinger wrote:
> If you execute straight `make`, this prevents the active make env from
> being passed on to sub children.  This prevents parallel building as
> well
> as build flag passing.
> 
> I also dropped the recursive make in ubi-utils/Makefile for the all
> target
> as this causes problems when building in parallel.  All of the targets
> that we actually care about are handled by the $(NTARGETS) target
> anyways.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

Thanks, applied on top of Sebastian's patch. Fixed conflicts. Please,
check.

-- 
> 
> Best regards,
> Artem Bityutskiy (Битюцкий Артём)