diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2019-12-11 17:38:15 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2019-12-11 17:38:15 +0000 |
| commit | 312809fe7fefbc8d5caa2b59089a5d9266378057 (patch) | |
| tree | d27e6f766ba2a6b544e5529b800f0313971983b2 /lib | |
| parent | 2c9a9dfc187d171de6b92654d71b977f067ed641 (diff) | |
Notes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libbsnmp/libbsnmp/Makefile | 7 | ||||
| -rw-r--r-- | lib/libgcc_eh/Makefile | 6 | ||||
| -rw-r--r-- | lib/libmagic/Makefile | 6 | ||||
| -rw-r--r-- | lib/libpmc/Makefile | 8 |
4 files changed, 26 insertions, 1 deletions
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile index 94c72795a51c9..c0a6cf2da6436 100644 --- a/lib/libbsnmp/libbsnmp/Makefile +++ b/lib/libbsnmp/libbsnmp/Makefile @@ -24,12 +24,17 @@ SRCS+= snmptc.h INCS= asn1.h snmp.h snmpagent.h snmpclient.h MAN= asn1.3 bsnmpagent.3 bsnmpclient.3 bsnmplib.3 +.if ${MK_DIRDEPS_BUILD} == "yes" +GENSNMPTREE?= ${HOST_OBJTOP}/usr.sbin/bsnmpd/gensnmptree/gensnmptree +.endif +GENSNMPTREE?= gensnmptree + snmptc.h : tc.def (\ echo "/* autogenerated from tc.def */";\ echo "#ifndef snmptc_h_1529923773";\ echo "#define snmptc_h_1529923773";\ - gensnmptree -E -f <${.ALLSRC};\ + ${GENSNMPTREE} -E -f <${.ALLSRC};\ echo "#endif" ; \ ) >${.TARGET} diff --git a/lib/libgcc_eh/Makefile b/lib/libgcc_eh/Makefile index 9909e73c9375f..bf018e16c9e06 100644 --- a/lib/libgcc_eh/Makefile +++ b/lib/libgcc_eh/Makefile @@ -10,4 +10,10 @@ WARNS?= 2 .include "Makefile.inc" +.if ${.MAKE.LEVEL} > 0 +# avoid circular dependencies +GENDIRDEPS_FILTER+= Nlib/msun +CFLAGS+= -I${SRCTOP}/lib/msun/src +.endif + .include <bsd.lib.mk> diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index b9a0e86767685..522574f28e790 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -40,6 +40,7 @@ magic: ${MAGFILES} magic.mgc: mkmagic magic ${BTOOLSPATH:U.}/mkmagic magic +.if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no" CLEANFILES+= mkmagic DEPENDOBJS+= mkmagic build-tools: mkmagic @@ -47,6 +48,11 @@ mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BU ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ ${.ALLSRC:N*.h:O:u} ${LDADD} +.endif +.if ${MK_DIRDEPS_BUILD} == "yes" +BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR} +.endif + FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ ${.CURDIR}/config.h CLEANFILES+= ${MAN} diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index 47f82a6f7cc9b..cb3ea17c38318 100644 --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -17,12 +17,20 @@ EVENT_ARCH="x86" EVENT_ARCH="powerpc" .endif +.if ${MK_DIRDEPS_BUILD} == "yes" +# avoid circular dependency +CFLAGS+= -I${RELDIR:H}/libpmcstat +GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat +JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents +.else JEVENTS= ${BTOOLSPATH:U.}/pmu-events/jevents + # This file is built in a subdirectory so never try to rebuild it here. ${JEVENTS}: .PHONY .if make(*clean*) SUBDIR+= pmu-events .endif +.endif libpmc_events.c: ${JEVENTS} ${JEVENTS} ${EVENT_ARCH} ${.CURDIR}/pmu-events/arch libpmc_events.c |