diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2008-08-20 13:52:05 -0400 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-08-21 11:56:40 +0300 |
| commit | 4d05d877670b40767292a63da1cb6632324e9cbb (patch) | |
| tree | 0afdb98c174154575058c0d8c59352b94b431e5e | |
| parent | f760fe9709da5a0e48ec339b6c88ecbd3d305396 (diff) | |
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>
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | ubi-utils/Makefile | 1 |
2 files changed, 4 insertions, 5 deletions
@@ -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 bc27f7b..4cca316 100644 --- 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} |