Tue May 7 04:29:45 2019 UTC ()
Add support for libprop as a host tool library.


(thorpej)
diff -r1.201 -r1.202 src/tools/Makefile
diff -r0 -r1.1 src/tools/libprop/Makefile
cvs diff -r1.201 -r1.202 src/tools/Makefile (expand / switch to unified diff)

--- src/tools/Makefile 2019/04/03 15:22:05 1.201
+++ src/tools/Makefile 2019/05/07 04:29:45 1.202
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.201 2019/04/03 15:22:05 joerg Exp $ 1# $NetBSD: Makefile,v 1.202 2019/05/07 04:29:45 thorpej Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include <bsd.endian.mk> 4.include <bsd.endian.mk>
5 5
6# Make sure that the ordered build/install processing applies when using 6# Make sure that the ordered build/install processing applies when using
7# plain make. 7# plain make.
8.MAIN: build_install 8.MAIN: build_install
9 9
10# TOOLDIR must be valid, unless MKTOOLS=no 10# TOOLDIR must be valid, unless MKTOOLS=no
11.if ${MKTOOLS:Uyes} != "no" 11.if ${MKTOOLS:Uyes} != "no"
12.if "${TOOLDIR}" == "" 12.if "${TOOLDIR}" == ""
13.error "TOOLDIR is undefined or empty" 13.error "TOOLDIR is undefined or empty"
14.elif "${TOOLDIR:tW:M/*}" == "" 14.elif "${TOOLDIR:tW:M/*}" == ""
@@ -91,27 +91,27 @@ dependall-binstall: dependall-compat @@ -91,27 +91,27 @@ dependall-binstall: dependall-compat
91 91
92# Dependencies in SUBDIR below ordered to maximize parallel ability. 92# Dependencies in SUBDIR below ordered to maximize parallel ability.
93# See above for special treatment for host-mkdep, compat, and binstall. 93# See above for special treatment for host-mkdep, compat, and binstall.
94# 94#
95SUBDIR= host-mkdep compat binstall \ 95SUBDIR= host-mkdep compat binstall \
96 .WAIT mktemp .WAIT sed .WAIT genassym 96 .WAIT mktemp .WAIT sed .WAIT genassym
97.if ${TOOLS_BUILDRUMP} == "no" 97.if ${TOOLS_BUILDRUMP} == "no"
98SUBDIR+= cap_mkdb crunchgen ctags gencat hexdump \ 98SUBDIR+= cap_mkdb crunchgen ctags gencat hexdump \
99 ${LINT_BITS} \ 99 ${LINT_BITS} \
100 makewhatis mtree nbperf .WAIT uudecode 100 makewhatis mtree nbperf .WAIT uudecode
101.endif 101.endif
102 102
103SUBDIR+= cat rpcgen join lorder m4 mkdep tsort xz-include .WAIT yacc .WAIT awk .WAIT lex 103SUBDIR+= cat rpcgen join lorder m4 mkdep tsort xz-include .WAIT yacc .WAIT awk .WAIT lex
104SUBDIR+= grep xz-lib 104SUBDIR+= grep xz-lib libprop
105 105
106.if ${TOOLS_BUILDRUMP} == "no" 106.if ${TOOLS_BUILDRUMP} == "no"
107SUBDIR += .WAIT texinfo \ 107SUBDIR += .WAIT texinfo \
108 .WAIT tic \ 108 .WAIT tic \
109 .WAIT pax \ 109 .WAIT pax \
110 .WAIT ${TOOLCHAIN_BITS} \ 110 .WAIT ${TOOLCHAIN_BITS} \
111 ${DTRACE_BITS} \ 111 ${DTRACE_BITS} \
112 asn1_compile cksum compile_et db \ 112 asn1_compile cksum compile_et db \
113 file lint1 slc \ 113 file lint1 slc \
114 makefs sortinfo \ 114 makefs sortinfo \
115 .WAIT menuc mkcsmapper mkesdb mklocale mknod msgc \ 115 .WAIT menuc mkcsmapper mkesdb mklocale mknod msgc \
116 .WAIT disklabel gpt \ 116 .WAIT disklabel gpt \
117 .WAIT paxctl \ 117 .WAIT paxctl \
File Added: src/tools/libprop/Makefile
#	$NetBSD: Makefile,v 1.1 2019/05/07 04:29:45 thorpej Exp $

HOSTLIB=	prop

.include <bsd.hostinit.mk>

LIBPROP_DIR=	${.CURDIR}/../../common/lib/libprop
LIBPROP_INC=	${.CURDIR}/../../common/include

.include "${LIBPROP_DIR}/Makefile.inc"

CPPFLAGS+=	-I${.CURDIR}/../compat -I${LIBPROP_INC}
CPPFLAGS+=	-I${TOOLDIR}/include/nbinclude

.PATH:		${LIBPROP_DIR}

CPPFLAGS+=	-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64

HOST_CPPFLAGS:=	${CPPFLAGS} ${HOST_CPPFLAGS}
CPPFLAGS:=	# empty

.include "${.CURDIR}/../Makefile.nbincludes"
.include <bsd.hostlib.mk>