mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-11 14:10:34 +00:00
Code Issues Releases Activity

style cleanup

Browse Source
This commit is contained in:
David E. O'Brien 2001-06-16 06:17:16 +00:00
parent 1b8dd28309
commit 3caacd361d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=78331
2 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sys/boot/efi/loader/Makefile
View File

@ -1,12 +1,12 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../common
BASE= loader BASE= loader
PROG= ${BASE}.efi PROG= ${BASE}.efi
NOMAN= NOMAN=
NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH} NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH}
.PATH: ${.CURDIR}/../common
SRCS+= main.c conf.c SRCS+= main.c conf.c
# Enable BootForth # Enable BootForth
@ -24,16 +24,16 @@ LIBFICL=
.endif .endif
# Always add MI sources # Always add MI sources
.PATH: ${.CURDIR}/../../common .PATH: ${.CURDIR}/../../common
.include <${.CURDIR}/../../common/Makefile.inc> .include <${.CURDIR}/../../common/Makefile.inc>
CFLAGS+= -I-
CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I-
CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} CFLAGS+= -I${.CURDIR}/../include
CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH}
CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../libefi CFLAGS+= -I${.CURDIR}/../../.. -I.
CFLAGS+= -DLOADER CFLAGS+= -I${.CURDIR}/../libefi
CFLAGS+= -Wall CFLAGS+= -DLOADER
LDSCRIPT= ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH} LDSCRIPT= ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH}
LDFLAGS= -nostdlib -T ${LDSCRIPT} -shared -Bsymbolic LDFLAGS= -nostdlib -T ${LDSCRIPT} -shared -Bsymbolic
@ -43,9 +43,9 @@ CLEANFILES+= setdef0.c setdef0.o setdef1.c setdef1.o setdefs.h start.o \
CLEANFILES+= loader.help CLEANFILES+= loader.help
CLEANFILES+= machine CLEANFILES+= machine
CRT= start.o CRT= start.o
all: ${PROG} all: ${PROG}
vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
@ -65,25 +65,26 @@ ${BASE}.efi: ${BASE}.sym
${BASE}.sym: ${OBJS} ${LIBSTAND} ${LIBARC} ${CRT} vers.o ${BASE}.sym: ${OBJS} ${LIBSTAND} ${LIBARC} ${CRT} vers.o
${LD} ${LDFLAGS} -o ${BASE}.sym -M \ ${LD} ${LDFLAGS} -o ${BASE}.sym -M \
${CRT} {OBJS} vers.o \ ${CRT} {OBJS} vers.o \
${LIBFICL} ${LIBSTAND} ${LIBEFI} ${LIBSTAND} \ ${LIBFICL} ${LIBSTAND} ${LIBEFI} ${LIBSTAND} \
> ${.OBJDIR}/${BASE}.list > ${.OBJDIR}/${BASE}.list
${BASE}.help: help.common help.efi ${BASE}.help: help.common help.efi
cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \
> ${.TARGET}
beforeinstall: beforeinstall:
.if exists(${.OBJDIR}/loader.help) .if exists(${.OBJDIR}/loader.help)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.OBJDIR}/${BASE}.help ${DESTDIR}/boot ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot
.else .else
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/${BASE}.help ${DESTDIR}/boot ${.CURDIR}/${BASE}.help ${DESTDIR}/boot
.endif .endif
# Other fragments still to be brought in from ../Makfile.booters? # Other fragments still to be brought in from ../Makfile.booters?
start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S
${CC} -c ${CFLAGS} $< ${CC} -c ${CFLAGS} ${.IMPSRC}
machine: machine:
ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine

45
sys/boot/ia64/efi/Makefile
View File

@ -1,12 +1,12 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../common
BASE= loader BASE= loader
PROG= ${BASE}.efi PROG= ${BASE}.efi
NOMAN= NOMAN=
NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH} NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH}
.PATH: ${.CURDIR}/../common
SRCS+= main.c conf.c SRCS+= main.c conf.c
# Enable BootForth # Enable BootForth
@ -24,16 +24,16 @@ LIBFICL=
.endif .endif
# Always add MI sources # Always add MI sources
.PATH: ${.CURDIR}/../../common .PATH: ${.CURDIR}/../../common
.include <${.CURDIR}/../../common/Makefile.inc> .include <${.CURDIR}/../../common/Makefile.inc>
CFLAGS+= -I-
CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I-
CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} CFLAGS+= -I${.CURDIR}/../include
CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH}
CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../libefi CFLAGS+= -I${.CURDIR}/../../.. -I.
CFLAGS+= -DLOADER CFLAGS+= -I${.CURDIR}/../libefi
CFLAGS+= -Wall CFLAGS+= -DLOADER
LDSCRIPT= ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH} LDSCRIPT= ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH}
LDFLAGS= -nostdlib -T ${LDSCRIPT} -shared -Bsymbolic LDFLAGS= -nostdlib -T ${LDSCRIPT} -shared -Bsymbolic
@ -43,9 +43,9 @@ CLEANFILES+= setdef0.c setdef0.o setdef1.c setdef1.o setdefs.h start.o \
CLEANFILES+= loader.help CLEANFILES+= loader.help
CLEANFILES+= machine CLEANFILES+= machine
CRT= start.o CRT= start.o
all: ${PROG} all: ${PROG}
vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
@ -65,25 +65,26 @@ ${BASE}.efi: ${BASE}.sym
${BASE}.sym: ${OBJS} ${LIBSTAND} ${LIBARC} ${CRT} vers.o ${BASE}.sym: ${OBJS} ${LIBSTAND} ${LIBARC} ${CRT} vers.o
${LD} ${LDFLAGS} -o ${BASE}.sym -M \ ${LD} ${LDFLAGS} -o ${BASE}.sym -M \
${CRT} {OBJS} vers.o \ ${CRT} {OBJS} vers.o \
${LIBFICL} ${LIBSTAND} ${LIBEFI} ${LIBSTAND} \ ${LIBFICL} ${LIBSTAND} ${LIBEFI} ${LIBSTAND} \
> ${.OBJDIR}/${BASE}.list > ${.OBJDIR}/${BASE}.list
${BASE}.help: help.common help.efi ${BASE}.help: help.common help.efi
cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \
> ${.TARGET}
beforeinstall: beforeinstall:
.if exists(${.OBJDIR}/loader.help) .if exists(${.OBJDIR}/loader.help)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.OBJDIR}/${BASE}.help ${DESTDIR}/boot ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot
.else .else
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/${BASE}.help ${DESTDIR}/boot ${.CURDIR}/${BASE}.help ${DESTDIR}/boot
.endif .endif
# Other fragments still to be brought in from ../Makfile.booters? # Other fragments still to be brought in from ../Makfile.booters?
start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S
${CC} -c ${CFLAGS} $< ${CC} -c ${CFLAGS} ${.IMPSRC}
machine: machine:
ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine