From bd831db65c7a8d887ad72471f50e119c3b7e3599 Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Thu, 11 Jun 2015 21:13:05 +0000 Subject: [PATCH] Misc fixes from projects/bmake Differential Revision: D2748 Reviewed by: brooks imp --- gnu/lib/libreadline/readline/Makefile | 12 ++++++++---- gnu/usr.bin/cc/cc_tools/Makefile | 3 +++ gnu/usr.bin/groff/Makefile.inc | 1 + include/mk-osreldate.sh | 2 +- kerberos5/Makefile.inc | 2 +- kerberos5/lib/libheimipcc/Makefile | 3 ++- lib/msun/Makefile | 2 ++ tests/sys/pjdfstest/pjdfstest/Makefile | 2 +- usr.bin/kdump/mkioctls | 2 +- 9 files changed, 20 insertions(+), 9 deletions(-) diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile index 2afeafc61f82..f0bfe5bd10fd 100644 --- a/gnu/lib/libreadline/readline/Makefile +++ b/gnu/lib/libreadline/readline/Makefile @@ -16,11 +16,15 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ CFLAGS+= -I${.OBJDIR}/.. SRCDIR= ${.CURDIR}/../../../../contrib/libreadline +.NOPATH: ${INSTALLED_HEADERS} + +beforebuild: ${INSTALLED_HEADERS} +CLEANFILES+= ${INSTALLED_HEADERS} +DPSRCS+= ${INSTALLED_HEADERS} + .for _h in ${INSTALLED_HEADERS} -CLEANFILES+= ${_h} -DPSRCS+= ${.OBJDIR}/${_h} -${.OBJDIR}/${_h}: ${SRCDIR}/${_h} - ${INSTALL} ${.ALLSRC} ${.TARGET} +${_h}: ${SRCDIR}/${_h} + ln -sf ${.ALLSRC} ${.TARGET} .endfor LIBADD= ncursesw diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index af731c13519b..4121f5cfafc5 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -215,6 +215,9 @@ tconfig.h: GENSRCS+= tconfig.h CLEANFILES+= cs-tconfig.h + +.NOPATH: ${GENSRCS} ${CLEANFILES} + # Options optionlist: ${OPT_FILES} LC_ALL=C awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET} diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc index 053f38580d71..67b61a875687 100644 --- a/gnu/usr.bin/groff/Makefile.inc +++ b/gnu/usr.bin/groff/Makefile.inc @@ -127,6 +127,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION` .sh .pl: @${ECHO} Making ${.TARGET} from ${.IMPSRC} + @rm -f ${.TARGET} @sed -e "s|@BINDIR@|${BINDIR}|g" \ -e 's|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME="$${GROFF_BIN_PATH=${BINDIR}}:"|g' \ -e "s;@FONTDIR@;$(fontdir);g" \ diff --git a/include/mk-osreldate.sh b/include/mk-osreldate.sh index 239a66159b2a..ed8311c6ead8 100755 --- a/include/mk-osreldate.sh +++ b/include/mk-osreldate.sh @@ -49,4 +49,4 @@ $COPYRIGHT #endif EOF chmod 644 $tmpfile -mv $tmpfile osreldate.h +mv -f $tmpfile osreldate.h diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 6048589df445..39bac1166cea 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -34,7 +34,7 @@ ETSRCS= \ .for ET in ${ETSRCS} .for _ET in ${ET:T:R} .if ${SRCS:M${_ET}.[ch]} != "" -.ORDER: ${_ET}.c ${_ET}.h +.ORDER: ${_ET}.h ${_ET}.c ${_ET}.c ${_ET}.h: ${ET} compile_et ${.ALLSRC} CLEANFILES+= ${_ET}.h ${_ET}.c diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile index 1016541af412..9ec712572371 100644 --- a/kerberos5/lib/libheimipcc/Makefile +++ b/kerberos5/lib/libheimipcc/Makefile @@ -10,7 +10,8 @@ SRCS= \ CFLAGS+= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/base \ - -I${KRB5DIR}/lib/ipc + -I${KRB5DIR}/lib/ipc \ + -I${KRB5DIR}/include .include diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 5cb629213a7a..094fcba15682 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -35,6 +35,8 @@ CFLAGS+= -I${.CURDIR}/ld80 CFLAGS+= -I${.CURDIR}/ld128 .endif +CFLAGS+= -I${.CURDIR}/${ARCH_SUBDIR} + .PATH: ${.CURDIR}/bsdsrc .PATH: ${.CURDIR}/src .PATH: ${.CURDIR}/man diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile index c0e82a41dc72..29bee82e8ba3 100644 --- a/tests/sys/pjdfstest/pjdfstest/Makefile +++ b/tests/sys/pjdfstest/pjdfstest/Makefile @@ -8,7 +8,7 @@ BINDIR= ${TESTSBASE}/sys/pjdfstest PROG= pjdfstest MAN= -CFLAGS= -D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS +CFLAGS+= -D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS CFLAGS+= -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT CFLAGS+= -DHAS_CONNECTAT diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index 525e143aa442..6880ee6fff4f 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -39,7 +39,7 @@ case "${MACHINE}" in esac awk -v x="$ioctl_includes" 'BEGIN {print x}' | - $CPP -I$1 -dM -DCOMPAT_43TTY - | + $CPP -nostdinc -I$1 -dM -DCOMPAT_43TTY - | awk -v ioctl_includes="$ioctl_includes" -v style="$style" ' BEGIN { print "/* XXX obnoxious prerequisites. */"