use $(MAKE) rather than make

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>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/Makefile b/Makefile
index 6ca6e0db48b099246160f2d944ea7923d5d8f006..796c31bd48409dbe96d8547f780fdc833d196116 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 bc27f7b3d69ea9433fb4722cc1292c6edc63745a..4cca316f41c562080531e21fdc905991d033a82b 100644 (file)
--- a/ubi-utils/Makefile
+++ b/ubi-utils/Makefile
@@ -30,7 +30,6 @@ 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}