Tweak some makefiles to prepare for bmake

These makefiles build fine with legacy make but contain (or lack)
information that causes the build to fail when used with bmake.  Make
small tweaks to makefiles to ensure they are compatible with both make
programs.

diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
index a5f8bde..dde2419 100644 (file)
--- a/gnu/usr.bin/cvs/doc/Makefile
+++ b/gnu/usr.bin/cvs/doc/Makefile
@@ -14,6 +14,9 @@ CLEANFILES+=  getdate-cvs.texi cvs.texinfo
 
 cvs.info: getdate-cvs.texi
 
+cvs.texinfo: ${SRCDIR}/${.TARGET}
+       cp ${.ALLSRC} ${.TARGET}
+
 getdate-cvs.texi: getdate.texi
        sed -e "s/^@chapter /@appendixsec /" \
            -e "s/^@section /@appendixsubsec /" \

diff --git a/gnu/usr.bin/diff/doc/Makefile b/gnu/usr.bin/diff/doc/Makefile
index bca5177..d915949 100644 (file)
--- a/gnu/usr.bin/diff/doc/Makefile
+++ b/gnu/usr.bin/diff/doc/Makefile
@@ -5,4 +5,7 @@ INFOSECTION=    "System Utilities"
 INFOENTRY_diff=        "* DIFF: (diff).                 DIFF/PATCH Reference Manual."
 INFO=          diffutils
 
+diffutils.info: ${SRCDIR}/${.TARGET}
+       cp ${.ALLSRC} ${.TARGET}
+
 .include <bsd.info.mk>

diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index 220098e..0c60963 100644 (file)
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -1,6 +1,5 @@
 #      @(#)Makefile    5.11 (Berkeley) 9/6/90
 # $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.27 2005/09/11 20:59:52 stefanf Exp $
-# $DragonFly: src/lib/libc/rpc/Makefile.inc,v 1.3 2005/08/05 23:43:19 swildner Exp $
 
 .PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/.
 SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
@@ -176,5 +175,5 @@ MLINKS+=    bindresvport.3 bindresvport_sa.3 \
                rpcbind.3 rpcb_rmtcall.3 \
                rpcbind.3 rpcb_set.3 \
                rpcbind.3 rpcb_unset.3
-#              rpc_svc_create.3 svc_control.3 \
+#              rpc_svc_create.3 svc_control.3
 .endif

diff --git a/sys/boot/pc32/boot2/Makefile b/sys/boot/pc32/boot2/Makefile
index 6a3f51f..9e4e47a 100644 (file)
--- a/sys/boot/pc32/boot2/Makefile
+++ b/sys/boot/pc32/boot2/Makefile
@@ -109,11 +109,13 @@ boot1$s.o: boot1.S
        ${CC} ${CFLAGS} ${_ADDCFLAGS$s} -DFLAGS=${B1FLAGS} \
                ${.ALLSRC} -o ${.TARGET} -c
 
-boot2$s.o: boot2.c ${.CURDIR}/../../common/ufsread.c ${.CURDIR}/../../../../lib/libstand/hammerread.c
+boot2$s.s: boot2.c boot2$s.h ${.CURDIR}/../../common/ufsread.c ${.CURDIR}/../../../../lib/libstand/hammerread.c
        ${CC} ${CFLAGS} ${_ADDCFLAGS$s} -S -o boot2$s.s.tmp ${.CURDIR}/boot2.c
-       sed -e '/align/d' -e '/nop/d' < boot2$s.s.tmp > boot2$s.s
-       rm -f boot2$s.s.tmp
-       ${AS} ${AFLAGS} -o boot2$s.o boot2$s.s
+       sed -e '/align/d' -e '/nop/d' < ${.TARGET}.tmp > ${.TARGET}
+       rm -f ${.TARGET}.tmp
+
+boot2$s.o: boot2$s.s
+       ${AS} ${AFLAGS} -o ${.TARGET} boot2$s.s
 
 boot2$s.h: boot1$s.out bootasmdef.nx
        @echo "NOTE: boot2 using xread from boot1 at ${REL1}"
@@ -139,8 +141,6 @@ boot2$s.out: boot2$s.o sio.o ${_ADDOBJS$s}
        ${LD} ${LDFLAGS} -Ttext ${ORG2} ${LINKSCRIPT} -o ${.TARGET} \
                ${BTX}/lib/crt0.o ${.ALLSRC}
 
-boot2$s.o: boot2$s.h
-
 CLEANFILES+=   boot1$s boot1$s.out boot1$s.o \
                boot2$s boot2$s.ldr boot2$s.bin \
                boot2$s.ld boot2$s.out boot2$s.o boot2$s.h boot2$s.s \

diff --git a/sys/boot/pc32/loader/Makefile b/sys/boot/pc32/loader/Makefile
index 7484922..8e33e6a 100644 (file)
--- a/sys/boot/pc32/loader/Makefile
+++ b/sys/boot/pc32/loader/Makefile
@@ -81,8 +81,10 @@ CFLAGS+=     -I${.CURDIR}/../btx/lib
 # Debug me!
 #CFLAGS+=      -g
 
-vers.o:        ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
+vers.c:        ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
        sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
+
+vers.o: vers.c
        ${CC} ${CFLAGS} -c vers.c
 
 ${PROG}: ${PROG}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT}

diff --git a/sys/boot/pc32/loader_tftp/Makefile b/sys/boot/pc32/loader_tftp/Makefile
index b4d75ea..0784dc6 100644 (file)
--- a/sys/boot/pc32/loader_tftp/Makefile
+++ b/sys/boot/pc32/loader_tftp/Makefile
@@ -81,8 +81,10 @@ CFLAGS+=     -I${.CURDIR}/../btx/lib
 # Debug me!
 #CFLAGS+=      -g
 
-vers.o:        ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
+vers.c:        ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
        sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
+
+vers.o: vers.c
        ${CC} ${CFLAGS} -c vers.c
 
 ${PROG}: ${PROG}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT}