From 65f1df2c51e9cff5bb3fbe5d571823e1a04a8039 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 21 Mar 2006 23:22:18 +0000 Subject: 2006-03-21 Thomas Schwinge * Makefile.in (clean): Also remove `kernel.gz', `kernel.stripped' and `kernel.stripped.gz'. * Makefile.in (kernel.o): Handle `$(systype)-objfiles-prepend'. * i386/Makefile.in (sysdep.a): Likewise. * i386/Makerules.in (kernel-objfiles-prepend): Transform variable into `$(systype)-objfiles-prepend'. (kernel.o): Remove target. --- Makefile.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index aac5c74..648317b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -245,7 +245,8 @@ check: kernel clean: $(MAKE) -C $(systype) $@ - rm -f clib-routines.o kernel.o kernel kernel-undef kernel-undef-bad + rm -f clib-routines.o kernel.o kernel-undef kernel-undef-bad + rm -f kernel kernel.gz kernel.stripped kernel.stripped.gz rm -f $(objfiles) $(subst .o,.d,$(objfiles)) rm -f *.symc *.symc.o *_user.c *_server.c *.h rm -f *.migs_d *.migsh_d *.migu_d *.miguh_d @@ -280,9 +281,12 @@ clib-routines := memcpy memmove memset bcopy bzero \ #kernel.a: $(objfiles) # @rm -f $@ # $(AR) cq $@ $^ + +# Then dependency on `$(systype)/sysdep.a' also makes sure that +# `$($(systype)-objfiles-prepend)' are created. kernel.o: $(objfiles) $(systype)/sysdep.a # kernel.a - $(LD) -r -o $@ $(kernel-objfiles-prepend) \ - $(filter-out $(kernel-objfiles-prepend),$^) + $(LD) -r -o $@ \ + $(addprefix $(systype)/,$($(systype)-objfiles-prepend)) $^ kernel-undef: kernel.o $(NM) -u $< | sed 's/ *U *//;s/^_*//' | sort -u > $@ kernel-undef-bad: kernel-undef Makefile -- cgit v1.2.3