From 8e7cfa8a006ba1e1616d8f88767666e4dda96de2 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 17 Aug 2001 04:48:03 +0000 Subject: 2001-08-16 Roland McGrath * 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 before "boot_script.h". --- serverboot/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'serverboot/Makefile') 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 -- cgit v1.2.3