diff options
| author | Roland McGrath <roland@gnu.org> | 2001-08-17 04:48:03 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-08-17 04:48:03 +0000 |
| commit | ed04b038e834eeee56a28d27789649dffe72b2b2 (patch) | |
| tree | 48ac73b82f3253cb6cbe9c8f4586e6db6ae7e9f5 /serverboot/Makefile | |
| parent | 1fa4593b8c243a45ff70b7704568c683ed832eb0 (diff) | |
| download | hurd-ed04b038e834eeee56a28d27789649dffe72b2b2.tar.gz hurd-ed04b038e834eeee56a28d27789649dffe72b2b2.tar.bz2 hurd-ed04b038e834eeee56a28d27789649dffe72b2b2.zip | |
2001-08-16 Roland McGrath <roland@frob.com>
* Makefile (OBJS): Add userland-boot.o here.
Add a vpath to find userland-boot.c in boot/ too.
* bootstrap.c (parse_script): Pass new arg to boot_script_parse_line.
* load.c: Include <stddef.h> before "boot_script.h".
Diffstat (limited to 'serverboot/Makefile')
| -rw-r--r-- | serverboot/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/serverboot/Makefile b/serverboot/Makefile index b274717e..b6b16c99 100644 --- a/serverboot/Makefile +++ b/serverboot/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997, 1999 Free Software Foundation, Inc. +# Copyright (C) 1997,99,2001 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 @@ -30,11 +30,14 @@ HURDLIBS = threads installationdir = $(prefix)/boot UNZIP_OBJS = unzip.o inflate.o util.o do-bunzip2.o -OBJS = $(subst .c,.o,$(SRCS)) boot_script.o memory_objectServer.o \ - default_pagerServer.o excServer.o bootstrapServer.o \ - memory_object_defaultServer.o $(UNZIP_OBJS) +OBJS = $(subst .c,.o,$(SRCS)) \ + boot_script.o userland-boot.o \ + memory_objectServer.o \ + default_pagerServer.o excServer.o bootstrapServer.o \ + memory_object_defaultServer.o $(UNZIP_OBJS) vpath boot_script.c $(srcdir)/../boot +vpath userland-boot.c $(srcdir)/../boot # Look for zip stuff VPATH += $(srcdir)/../exec |