summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2006-03-21 23:22:18 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:26:36 +0200
commit65f1df2c51e9cff5bb3fbe5d571823e1a04a8039 (patch)
tree5909db52074330ef705fb082801db2bfc668ebcd /i386
parentec9defc2912e86a7e682ec6e37aac102fa69d94d (diff)
2006-03-21 Thomas Schwinge <tschwinge@gnu.org>
* 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.
Diffstat (limited to 'i386')
-rw-r--r--i386/Makefile.in5
-rw-r--r--i386/Makerules.in6
2 files changed, 5 insertions, 6 deletions
diff --git a/i386/Makefile.in b/i386/Makefile.in
index d22a1aa..8aa62e4 100644
--- a/i386/Makefile.in
+++ b/i386/Makefile.in
@@ -131,10 +131,11 @@ INCLUDES = -I. -I$(srcdir)/i386at -I$(srcdir)/i386 \
all: sysdep.a
$(MAKE) -C linux $@
-# `boothdr.o' is special.
+# `$($(systype)-objfiles-prepend)' are special, but are nevertheless
+# created for the target `sysdep.a'.
sysdep.a: $(objfiles) linux/linux.o
rm -f $@
- $(AR) cr $@ $(filter-out boothdr.o,$^)
+ $(AR) cr $@ $(filter-out $($(systype)-objfiles-prepend),$^)
$(RANLIB) $@
check:
diff --git a/i386/Makerules.in b/i386/Makerules.in
index 1957e0f..f6c90da 100644
--- a/i386/Makerules.in
+++ b/i386/Makerules.in
@@ -33,10 +33,8 @@ DEFINES += -DCONTINUATIONS -D__ELF__ -Di386 $(DEFS-$(systype))
# Arrange for a suitable load address.
LDFLAGS-kernel += -Ttext 100000
-# `boothdr.o' has to be at the beginning.
-kernel-objfiles-prepend = $(systype)/boothdr.o
-
-kernel.o: $(kernel-objfiles-prepend)
+# `boothdr.o' has to be at the beginning of the kernel image.
+$(systype)-objfiles-prepend = boothdr.o
#