diff options
| author | Miles Bader <miles@gnu.org> | 1996-02-14 00:05:42 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 1996-02-14 00:05:42 +0000 |
| commit | c661e1e16af5b22fcc5003267dcb00ee1f0e28f8 (patch) | |
| tree | e50b7d89c4f8e38a17cf8bb6e2b9d85cabc77a8a | |
| parent | b7cfacdcb529525f7c44ad4f461090625309ea85 (diff) | |
(all): Depend on `boot' and `uxboot'.
(COMMON-OBJS, UX-OBJS): New macros.
(OBJS): Inherit most names from $(COMMON-OBJS).
(LCLHDRS): Add ux.h.
(LDFLAGS): Use target-specific value.
(uxboot.0-LDFLAGS): New macro (with contents from old LDFLAGS).
(uxboot.o, uxboot.0): New targets.
(uxboot): Target renamed from boot.a.
| -rw-r--r-- | boot/Makefile | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/boot/Makefile b/boot/Makefile index 516985b6..4646d18c 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. +# Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. # This file is part of the GNU Hurd. # # The GNU Hurd is free software; you can redistribute it and/or modify @@ -18,33 +18,40 @@ dir := boot makemode := utility -SRCS = mach-crt0.c boot.c tcattr.c sigvec.S syscall.S boot_script.c -OBJS = mach-crt0.o boot.o notifyServer.o ourdeviceServer.o \ - ioServer.o io_replyUser.o device_replyUser.o sigvec.o syscall.o \ +SRCS = mach-crt0.c boot.c ux.c tcattr.c sigvec.S syscall.S boot_script.c +COMMON-OBJS = notifyServer.o ourdeviceServer.o \ + ioServer.o io_replyUser.o device_replyUser.o \ termServer.o tcattr.o bootstrapServer.o boot_script.o -LCLHDRS = boot_script.h +OBJS = boot.o $(COMMON-OBJS) +UX-OBJS = mach-crt0.o uxboot.o sigvec.o syscall.o ux.o $(COMMON-OBJS) +LCLHDRS = boot_script.h ux.h target = boot io-MIGSFLAGS=-DREPLY_PORTS DIST_FILES=frank1.ld frankemul.ld include ../Makeconf -LDFLAGS += -static -nostartfiles -Wl,-T -Wl,frank1.ld - #install: /usr/local/bin/boot # #/usr/local/bin/boot: boot # cp boot /usr/local/bin/boot -all: boot.a +all: boot uxboot ourdevice.defs: $(includedir)/device/device.defs sed -e '/out device : device_t/s/device_t/mach_port_send_t/' $< > $@ +LDFLAGS += $($@-LDFLAGS) + boot: ../libthreads/libthreads.a -boot.1: boot frankemul.ld - $(LD) -o boot.1 -T frankemul.ld boot -boot.a: boot.1 - $(OBJCOPY) -S --remove-section=.comment -O a.out-mach3 \ - boot.1 boot.a +uxboot.o: boot.c + $(COMPILE.c) -DUX $< -o $@ + +uxboot.0-LDFLAGS += -static -nostartfiles -Wl,-T -Wl,frank1.ld +uxboot.0: $(UX-OBJS) ../libthreads/libthreads.a + $(LINK.o) -o $@ $(UX-OBJS) ../libthreads/libthreads.a +uxboot.1: uxboot.0 frankemul.ld + $(LD) -o $@ -T frankemul.ld uxboot.0 +uxboot: uxboot.1 + $(OBJCOPY) -S --remove-section=.comment -O a.out-mach3 $< $@ |