diff options
Diffstat (limited to 'sys/arch/amd64/stand')
| -rw-r--r-- | sys/arch/amd64/stand/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/boot/Makefile | 11 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/cdboot/Makefile | 11 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/Makefile | 12 |
4 files changed, 13 insertions, 25 deletions
diff --git a/sys/arch/amd64/stand/Makefile.inc b/sys/arch/amd64/stand/Makefile.inc index 7ef3710014d..41cc0024285 100644 --- a/sys/arch/amd64/stand/Makefile.inc +++ b/sys/arch/amd64/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2005/12/30 02:03:48 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2007/11/25 18:25:30 deraadt Exp $ CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror CFLAGS+= -fno-stack-protector @@ -27,7 +27,7 @@ CLEANFILES+= machine SACFLAGS+=-nostdinc -fno-builtin -fpack-struct .endif -.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj) +.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) .BEGIN: @([ X$(S) = X -o -h machine ] || ln -s $(S)/arch/amd64/include machine) .endif diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile index 5bbae80bbe7..e53352882a2 100644 --- a/sys/arch/amd64/stand/boot/Makefile +++ b/sys/arch/amd64/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2007/05/30 01:25:43 tom Exp $ +# $OpenBSD: Makefile,v 1.8 2007/11/25 18:25:30 deraadt Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -26,18 +26,15 @@ SRCS+= gidt.S alloca.S biosdev.c bioscons.c gateA20.c \ SRCS+= boot.c cmd.c vars.c bootarg.c .PATH: ${S}/lib/libsa -.PATH: ${S}/lib/libkern # for strl* and gcc support -# stand routines SRCS+= alloc.c exit.c getfile.c gets.c globals.c strcmp.c strlen.c \ strncmp.c memcmp.c memcpy.c memset.c printf.c snprintf.c \ strerror.c strncpy.c strtol.c strtoll.c ctime.c strlcpy.c strlcat.c -# io routines SRCS+= close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \ open.c read.c stat.c write.c cread.c readdir.c cons.c loadfile.c \ elf32.c elf64.c -# boot filesystems SRCS+= ufs.c -# gcc support + +.PATH: ${S}/lib/libkern/arch/amd64 ${S}/lib/libkern SRCS+= divdi3.c moddi3.c qdivrem.c .PATH: ${S}/lib/libz @@ -48,7 +45,7 @@ boot.bin: boot ${PROG}: $(OBJS) $(LD) $(LDFLAGS) -o ${PROG} $(OBJS) - #@$(SIZE) ${PROG} + @$(SIZE) ${PROG} .else NOPROG= diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile index 21469c17ed6..33b56c737a9 100644 --- a/sys/arch/amd64/stand/cdboot/Makefile +++ b/sys/arch/amd64/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2007/05/30 01:25:43 tom Exp $ +# $OpenBSD: Makefile,v 1.11 2007/11/25 18:25:30 deraadt Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -26,20 +26,15 @@ SRCS+= gidt.S alloca.S biosdev.c bioscons.c gateA20.c \ SRCS+= cmd.c vars.c bootarg.c .PATH: ${S}/lib/libsa -.PATH: ${S}/lib/libkern # for strl* and gcc support -# stand routines -# not required: getfile.c gets.c globals.c strlcat.c SRCS+= alloc.c exit.c strcmp.c strlen.c \ strncmp.c memcmp.c memcpy.c memset.c printf.c snprintf.c \ strerror.c strncpy.c strtol.c strtoll.c ctime.c strlcpy.c -# io routines -# not required: ioctl.c write.c SRCS+= close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c lseek.c \ open.c read.c stat.c cread.c readdir.c cons.c loadfile.c \ elf32.c elf64.c -# boot filesystems SRCS+= ufs.c cd9660.c -# gcc support + +.PATH: ${S}/lib/libkern/arch/i386 ${S}/lib/libkern SRCS+= divdi3.c moddi3.c qdivrem.c .PATH: ${S}/lib/libz diff --git a/sys/arch/amd64/stand/pxeboot/Makefile b/sys/arch/amd64/stand/pxeboot/Makefile index 801ff654c3e..1f346cbb1c8 100644 --- a/sys/arch/amd64/stand/pxeboot/Makefile +++ b/sys/arch/amd64/stand/pxeboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2007/05/30 01:25:43 tom Exp $ +# $OpenBSD: Makefile,v 1.8 2007/11/25 18:25:30 deraadt Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -27,22 +27,18 @@ SRCS+= pxe.c pxe_call.S pxe_net.c SRCS+= boot.c cmd.c vars.c bootarg.c .PATH: ${S}/lib/libsa -.PATH: ${S}/lib/libkern # for strl* and gcc support -# stand routines SRCS+= alloc.c exit.c getfile.c gets.c globals.c strcmp.c strlen.c \ strncmp.c memcmp.c memcpy.c memset.c printf.c snprintf.c \ strerror.c strncpy.c strtol.c strtoll.c ctime.c strlcpy.c strlcat.c -# io routines + SRCS+= close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \ read.c stat.c write.c cread.c readdir.c cons.c loadfile.c \ elf32.c elf64.c -# network routines SRCS+= ether.c netif.c rpc.c -# network info services SRCS+= bootp.c bootparam.c -# boot filesystems SRCS+= ufs.c nfs.c tftp.c -# gcc support + +.PATH: ${S}/lib/libkern/arch/amd64 ${S}/lib/libkern SRCS+= divdi3.c moddi3.c qdivrem.c .PATH: ${S}/lib/libz |