From 5253e14d8671e6fbb7cfacf2ec152edb3d9c11f0 Mon Sep 17 00:00:00 2001 From: tecodev Date: Sun, 1 Mar 2009 21:52:55 +0000 Subject: [PATCH] * device/lib/Makefile.in: fixed parallel builds (i.e., make -jN, N>1) git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5399 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 4 ++++ device/lib/Makefile.in | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ee2328c..4909dc16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-03-01 Raphael Neider + + * device/lib/Makefile.in: fixed parallel builds (i.e., make -jN, N>1) + 2009-03-01 Borut Razem * src/z80/peep.c: fixed bug #2648964: --i-code-in-asm crashes sdcc diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in index 5fc4f479..70b3a6dd 100644 --- a/device/lib/Makefile.in +++ b/device/lib/Makefile.in @@ -193,9 +193,16 @@ endif # Compiling entire program or any subproject # ------------------------------------------ -all: checkconf $(TARGETS) +all: + $(MAKE) checkconf + $(MAKE) $(TARGETS) -objects: build-dir $(OBJECTS) port-specific-objects $(LIB_FILES) clean_intermediate +objects: + $(MAKE) build-dir + $(MAKE) $(OBJECTS) + $(MAKE) port-specific-objects + $(MAKE) $(LIB_FILES) + $(MAKE) clean_intermediate models: if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \ @@ -241,7 +248,10 @@ model-xa51: $(MAKE) MODELFLAGS="-mxa51" PORT=xa51 objects-xa51; \ fi -objects-xa51: build-dir $(XA51OBJECTS) port-specific-objects +objects-xa51: + $(MAKE) build-dir + $(MAKE) $(XA51OBJECTS) + $(MAKE) port-specific-objects $(PORTDIR)/lib$(PORT).lib: $(XA51OBJECTS) ifeq ($(LIB_TYPE), SDCCLIB) @@ -267,30 +277,44 @@ model-gbz80: $(MAKE) MODELFLAGS="-mgbz80" PORT=gbz80 objects-z80 OEXT=.o; \ fi -objects-z80: build-dir port-specific-objects clean_intermediate +objects-z80: + $(MAKE) build-dir + $(MAKE) port-specific-objects + $(MAKE) clean_intermediate model-hc08: if grep '^hc08\>' $(top_builddir)/ports.build > /dev/null; then \ $(MAKE) MODELFLAGS="-mhc08" PORT=hc08 objects-hc08; \ fi -objects-hc08: build-dir port-specific-objects clean_intermediate +objects-hc08: + $(MAKE) build-dir + $(MAKE) port-specific-objects + $(MAKE) clean_intermediate model-pic16: if grep '^pic16\>' $(top_builddir)/ports.build > /dev/null; then \ $(MAKE) PORT=pic16 objects-pic16; \ fi -objects-pic16: build-dir port-specific-objects-pic16 clean_intermediate-pic16 +objects-pic16: + $(MAKE) build-dir + $(MAKE) port-specific-objects-pic16 + $(MAKE) clean_intermediate-pic16 model-pic14: if grep '^pic\>' $(top_builddir)/ports.build > /dev/null; then \ $(MAKE) PORT=pic objects-pic14; \ fi -objects-pic14: build-dir port-specific-objects-pic14 clean_intermediate-pic14 +objects-pic14: + $(MAKE) build-dir + $(MAKE) port-specific-objects-pic14 + $(MAKE) clean_intermediate-pic14 -build-dir: $(PORTDIR) $(PORT) +build-dir: + $(MAKE) $(PORTDIR) + $(MAKE) $(PORT) $(PORTDIR): mkdir -p $(PORTDIR) -- 2.30.2