Move stand/ofw/libofw to stand/libofw.
Since rS330365, there has been no particular reason for libofw to be in a subdirectory of ofw. Move libofw up a level to make it fit in better with the other top level libraries. Also add a LIBOFWSRC to stand/defs.mk to match what all the other libraries are doing. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D23000
This commit is contained in:
parent
bad7e1e85c
commit
475008d6ca
@ -16,7 +16,7 @@ S.${MK_FORTH}+= forth
|
||||
S.${MK_LOADER_LUA}+= liblua
|
||||
S.${MK_LOADER_LUA}+= lua
|
||||
S.${MK_FDT}+= fdt
|
||||
S.${MK_LOADER_OFW}+= ofw
|
||||
S.${MK_LOADER_OFW}+= libofw
|
||||
S.yes+= defaults
|
||||
S.yes+= man
|
||||
|
||||
|
@ -28,6 +28,7 @@ FDTSRC= ${BOOTSRC}/fdt
|
||||
FICLSRC= ${BOOTSRC}/ficl
|
||||
LDRSRC= ${BOOTSRC}/common
|
||||
LIBLUASRC= ${BOOTSRC}/liblua
|
||||
LIBOFWSRC= ${BOOTSRC}/libofw
|
||||
LUASRC= ${SRCTOP}/contrib/lua/src
|
||||
SASRC= ${BOOTSRC}/libsa
|
||||
SYSDIR= ${SRCTOP}/sys
|
||||
|
@ -1,5 +0,0 @@
|
||||
# $FreeBSD$
|
||||
|
||||
SUBDIR= libofw
|
||||
|
||||
.include <bsd.subdir.mk>
|
@ -1,3 +0,0 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include "../Makefile.inc"
|
@ -44,8 +44,8 @@ CFLAGS+= -DRELOC=${RELOC} -g
|
||||
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
||||
|
||||
# Open Firmware standalone support library
|
||||
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
|
||||
CFLAGS+= -I${BOOTSRC}/ofw/libofw
|
||||
LIBOFW= ${BOOTOBJ}/libofw/libofw.a
|
||||
CFLAGS+= -I${BOOTSRC}/libofw
|
||||
|
||||
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||
|
@ -47,8 +47,8 @@ LINKS= ${BINDIR}/loader ${BINDIR}/zfsloader
|
||||
.endif
|
||||
|
||||
# Open Firmware standalone support library
|
||||
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
|
||||
CFLAGS+= -I${BOOTSRC}/ofw/libofw/
|
||||
LIBOFW= ${BOOTOBJ}/libofw/libofw.a
|
||||
CFLAGS+= -I${BOOTSRC}/libofw
|
||||
|
||||
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA}
|
||||
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA}
|
||||
|
Loading…
Reference in New Issue
Block a user