From e4d7dd5cf7a0ee992810d8ec3192741ccce00533 Mon Sep 17 00:00:00 2001 From: weissms Date: Sun, 21 Oct 2012 12:26:44 +0000 Subject: [PATCH] Avoid building ilbmtoicon and infoinfo twice via 'all' target, clean infoinfo. May break the build with more that one make jobs. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45936 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- Makefile.in | 6 +++--- tools/ilbmtoicon/Makefile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index f70274b41f..0a9362ebb9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Copyright © 2000-2011, The AROS Development Team. All rights reserved. +# Copyright © 2000-2012, The AROS Development Team. All rights reserved. # $Id$ # # Main makefile for AROS @@ -92,11 +92,11 @@ $(ILBMTOC) : $(SRCDIR)/tools/ilbmtoc/ilbmtoc.c $(ILBMTOICON) : $(SRCDIR)/tools/ilbmtoicon/ilbmtoicon.c @$(ECHO) Building ilbmtoicon... - @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/ilbmtoicon SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) $(basename $@) -C $(SRCDIR)/tools/ilbmtoicon SRCDIR=$(SRCDIR) TOP=$(TOP) $(INFOINFO) : $(SRCDIR)/tools/ilbmtoicon/infoinfo.c @$(ECHO) Building infoinfo... - @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/ilbmtoicon SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) $(basename $@) -C $(SRCDIR)/tools/ilbmtoicon SRCDIR=$(SRCDIR) TOP=$(TOP) $(COLLECT-AROS) : $(wildcard $(SRCDIR)/tools/collect-aros/*.[hc]) @$(ECHO) Building collect-aros... diff --git a/tools/ilbmtoicon/Makefile b/tools/ilbmtoicon/Makefile index 69a330a747..64a89a134c 100644 --- a/tools/ilbmtoicon/Makefile +++ b/tools/ilbmtoicon/Makefile @@ -1,4 +1,4 @@ -# Copyright © 1995-2011, The AROS Development Team. All rights reserved. +# Copyright © 1995-2012, The AROS Development Team. All rights reserved. # $Id$ # # Desc: Makefile for ilbmtoicon @@ -46,3 +46,4 @@ $(INFOINFO) : infoinfo.c clean: @$(RM) -f $(ILBMTOICON) + @$(RM) -f $(INFOINFO) -- 2.11.4.GIT