- Be consistent how libhack is used: If extra HACKOBJS (e.g., gethost.o) are

required, define them before pulling in libhack/Makefile.inc so that the dependencies work correctly. - Other minor cleanups
2002-03-28 04:33:21 +00:00 · 2002-03-28 04:33:21 +00:00 · 484f8db2eb
parent 42e21b0c6a
commit 484f8db2eb
19 changed files with 140 additions and 160 deletions
--- a/distrib/atari/miniroot/Makefile.inc
+++ b/distrib/atari/miniroot/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.7 2002/03/25 07:43:39 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2002/03/28 04:33:21 lukem Exp $

 IMAGESIZE=	1080k
 IMAGEENDIAN=	be
@ -6,8 +6,8 @@ MAKEDEVTARGETS=	floppy
 IMAGEDEPENDS+=	${ARCHDIR}/disktab.shadow ${ARCHDIR}/dot.profile \
 		${ARCHDIR}/install.md ${ARCHDIR}/termcap.vt

-HACKSRC= ${DISTRIBDIR}/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-HACKOBJS+=	gethost.o
-
-${CRUNCHBIN}: libhack.o
+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+HACKOBJS=	gethost.o
+.include	"${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}:	libhack.o
--- a/distrib/evbsh3/rom/ramdiskeb/Makefile
+++ b/distrib/evbsh3/rom/ramdiskeb/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2002/03/25 07:43:41 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2002/03/28 04:33:21 lukem Exp $

 TOP=		${.CURDIR}/..
 WARNS=1
@ -72,13 +72,11 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	${MAKE} -f ${CBIN}.mk all

-# This is listed in stonebin.conf but is built here.
-#${CBIN}: libhack.o
-
 # Use stubs to eliminate some large stuff from libc
-HACKSRC=${TOP}/../../utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-HACKOBJS+=	gethost.o
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+HACKOBJS=	gethost.o
+.include	"${HACKSRC}/Makefile.inc"
+${CBIN}:	libhack.o

 mount:
 	${VNCONFIG} -v -c ${VND_CDEV} ${IMAGE} \
--- a/distrib/evbsh3/rom/ramdiskel/Makefile
+++ b/distrib/evbsh3/rom/ramdiskel/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2002/03/25 07:43:41 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2002/03/28 04:33:21 lukem Exp $

 TOP=		${.CURDIR}/..
 WARNS=1
@ -72,13 +72,11 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	${MAKE} -f ${CBIN}.mk all

-# This is listed in stonebin.conf but is built here.
-#${CBIN}: libhack.o
-
 # Use stubs to eliminate some large stuff from libc
-HACKSRC=${TOP}/../../utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-HACKOBJS+=	gethost.o
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+HACKOBJS=	gethost.o
+.include	"${HACKSRC}/Makefile.inc"
+${CBIN}:	libhack.o

 mount:
 	${VNCONFIG} -v -c ${VND_CDEV} ${IMAGE} \
--- a/distrib/hp300/ramdisk/Makefile
+++ b/distrib/hp300/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2002/03/25 07:43:42 lukem Exp $
+#	$NetBSD: Makefile,v 1.13 2002/03/28 04:33:22 lukem Exp $

 .include "${.CURDIR}/../../Makefile.inc"
 .include <bsd.own.mk>
@ -20,20 +20,16 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${_SRC_TOP_}/etc/protocols ${_SRC_TOP_}/etc/netconfig \
 		${_SRC_TOP_}/etc/services

+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}:	libhack.o
+

 realall: ${IMAGE}

 release:

-
-# Use stubs to eliminate some large stuff from libc
-HACKSRC=${DISTRIBDIR}/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-
-# This is listed in ramdiskbin.conf but is built here.
-${CRUNCHBIN}: libhack.o
-
-
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
 .include "${DISTRIBDIR}/common/Makefile.image"
--- a/distrib/i386/floppies/common/Makefile.ramdisk
+++ b/distrib/i386/floppies/common/Makefile.ramdisk
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ramdisk,v 1.12 2002/03/28 02:57:29 lukem Exp $
+#	$NetBSD: Makefile.ramdisk,v 1.13 2002/03/28 04:33:22 lukem Exp $

 TOP=	${.CURDIR}/..

@ -22,25 +22,20 @@ IMAGEDEPENDS+= 	${CRUNCHBIN} \
 		${_SRC_TOP_}/etc/services
 PARSELISTENV+=	BOOTMODEL=${BOOTMODEL:Q}

-
 .if defined(USE_SYSINST)
 LISTS+=		${DISTRIBDIR}/common/list.sysinst
 .endif

+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}:	libhack.o
+

 realall: ${IMAGE}

 release:

-
-# Use stubs to eliminate some large stuff from libc
-HACKSRC=${DISTRIBDIR}/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-
-# This is listed in ramdiskbin.conf but is built here.
-${CRUNCHBIN}: libhack.o
-
-
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
 .include "${DISTRIBDIR}/common/Makefile.image"
--- a/distrib/mac68k/instkernel/ramdisk/Makefile
+++ b/distrib/mac68k/instkernel/ramdisk/Makefile
@ -1,12 +1,8 @@
-#	$NetBSD: Makefile,v 1.18 2002/03/28 03:00:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.19 2002/03/28 04:33:22 lukem Exp $

 .include "${.CURDIR}/../../../Makefile.inc"
 .include <bsd.own.mk>

-.ifndef NOTESOBJDIR
-NOTESOBJDIR!=cd ${DISTRIBDIR}/notes/mac68k && ${PRINTOBJDIR}
-.endif
-
 IMAGE=		ramdisk.fs
 IMAGESIZE=	2048k

@ -20,29 +16,28 @@ MAKEDEVTARGETS=	raminst
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		disktab.preinstall dot.hdprofile dot.profile \
 		${.CURDIR}/../../miniroot/termcap \
-		${NOTESOBJDIR}/INSTALL.more \
 		${_SRC_TOP_}/etc/group ${_SRC_TOP_}/etc/master.passwd \
 		${_SRC_TOP_}/etc/netconfig ${_SRC_TOP_}/etc/protocols \
 		${_SRC_TOP_}/etc/services

+.ifndef NOTESOBJDIR
+NOTESOBJDIR!=	cd ${DISTRIBDIR}/notes/mac68k && ${PRINTOBJDIR}
+.endif
+IMAGEDEPENDS+=	${NOTESOBJDIR}/INSTALL.more
+PARSELISTENV=	NOTESOBJDIR=${NOTESOBJDIR}
+
+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}:	libhack.o
+

 realall: ${IMAGE}

 release:

-
-# Use stubs to eliminate some large stuff from libc
-HACKSRC=${DISTRIBDIR}/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-
-# This is listed in ramdiskbin.conf but is built here.
-${CRUNCHBIN}: libhack.o
-
-
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
 .include "${DISTRIBDIR}/common/Makefile.image"

-PARSELISTENV+=	NOTESOBJDIR=${NOTESOBJDIR}
-
 .include <bsd.prog.mk>
--- a/distrib/macppc/floppies/ramdisk/Makefile
+++ b/distrib/macppc/floppies/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2002/02/04 11:13:33 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.22 2002/03/28 04:33:22 lukem Exp $

 TOP=		${.CURDIR}/..

@ -48,11 +48,13 @@ unconfig:
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 	${CRUNCHGEN} -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}

-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c libhack.o
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	${MAKE} -f ${CBIN}.mk DBG="${DBG}" all

-HACKSRC=${TOP}/../../utils/libhack
-.include "${HACKSRC}/Makefile.inc"
+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CBIN}:	libhack.o

 clean cleandir distclean:
 	if [ -f ${CBIN}.mk ]; then ${MAKE} -f ${CBIN}.mk clean; fi;
--- a/distrib/mvme68k/ramdisk/Makefile
+++ b/distrib/mvme68k/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2002/03/26 01:12:36 lukem Exp $
+#	$NetBSD: Makefile,v 1.19 2002/03/28 04:33:22 lukem Exp $

 .include "${.CURDIR}/../../Makefile.inc"
 .include <bsd.own.mk>
@ -21,20 +21,16 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${_SRC_TOP_}/etc/netconfig ${_SRC_TOP_}/etc/protocols \
 		${_SRC_TOP_}/etc/services

+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}:	libhack.o
+

 realall: ${IMAGE}

 release:

-
-# Use stubs to eliminate some large stuff from libc
-HACKSRC=${DISTRIBDIR}/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-
-# This is listed in ramdiskbin.conf but is built here.
-${CRUNCHBIN}: libhack.o
-
-
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
 .include "${DISTRIBDIR}/common/Makefile.image"
--- a/distrib/news68k/floppies/ramdisk/Makefile
+++ b/distrib/news68k/floppies/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2002/03/28 03:12:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.23 2002/03/28 04:33:23 lukem Exp $

 .include "${.CURDIR}/../../../Makefile.inc"
 .include <bsd.own.mk>
@ -20,17 +20,16 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${_SRC_TOP_}/etc/netconfig ${_SRC_TOP_}/etc/protocols \
 		${_SRC_TOP_}/etc/services

+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}:	libhack.o
+
+
 realall: ${IMAGE}

 release:

-# Use stubs to eliminate some large stuff from libc
-HACKSRC=${DISTRIBDIR}/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-
-# This is listed in "list" file but is built here.
-${CRUNCHBIN}:	libhack.o
-
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
 .include "${DISTRIBDIR}/common/Makefile.image"
--- a/distrib/newsmips/floppies/ramdisk/Makefile
+++ b/distrib/newsmips/floppies/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2002/03/28 03:12:29 lukem Exp $
+#	$NetBSD: Makefile,v 1.16 2002/03/28 04:33:23 lukem Exp $

 .include "${.CURDIR}/../../../Makefile.inc"
 .include <bsd.own.mk>
@ -20,17 +20,16 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${_SRC_TOP_}/etc/netconfig ${_SRC_TOP_}/etc/protocols \
 		${_SRC_TOP_}/etc/services

+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}:	libhack.o
+
+
 realall: ${IMAGE}

 release:

-# Use stubs to eliminate some large stuff from libc
-HACKSRC=${DISTRIBDIR}/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-
-# This is listed in "list" file but is built here.
-${CRUNCHBIN}:	libhack.o
-
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
 .include "${DISTRIBDIR}/common/Makefile.image"
--- a/distrib/prep/floppies/ramdisk/Makefile
+++ b/distrib/prep/floppies/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2002/03/25 07:43:45 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2002/03/28 04:33:23 lukem Exp $

 TOP=		${.CURDIR}/..

@ -57,11 +57,13 @@ unconfig:
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 	${CRUNCHGEN} -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}

-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c libhack.o
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	${MAKE} -f ${CBIN}.mk DBG="${DBG}" all

-HACKSRC=	${TOP}/../../utils/libhack
-.include "${HACKSRC}/Makefile.inc"
+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CBIN}:	libhack.o

 release:

--- a/distrib/sandpoint/floppies/ramdisk/Makefile
+++ b/distrib/sandpoint/floppies/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2002/03/25 07:43:46 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2002/03/28 04:33:23 lukem Exp $

 TOP=		${.CURDIR}/..

@ -52,11 +52,13 @@ unconfig:
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 	${CRUNCHGEN} -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}

-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c libhack.o
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	${MAKE} -f ${CBIN}.mk DBG="${DBG}" all

-HACKSRC=${TOP}/../../utils/libhack
-.include "${HACKSRC}/Makefile.inc"
+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CBIN}:	libhack.o

 release:

--- a/distrib/sparc/ramdisk/Makefile
+++ b/distrib/sparc/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2002/03/25 07:43:46 lukem Exp $
+#	$NetBSD: Makefile,v 1.34 2002/03/28 04:33:23 lukem Exp $
 #
 # ramdisk.fs is the microroot filesystem intended for use with
 # the INSTALL kernel. It provides just enough tools to extract the
@ -21,17 +21,15 @@ IMAGEENDIAN=	be
 MAKEDEVTARGETS=	floppy
 IMAGEDEPENDS+=	${CRUNCHBIN} dot.profile

+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+HACKOBJS=	gethost.o
+.include	"${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}:	libhack.o
+

 realall: ${IMAGE}

-# Use stubs to eliminate some large stuff from libc
-HACKSRC=${_SRC_TOP_}/distrib/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-HACKOBJS+=	gethost.o
-
-# This is listed in ramdiskbin.conf but is built here.
-${CRUNCHBIN}: libhack.o
-
 release:


--- a/distrib/sparc64/xminiroot/Makefile
+++ b/distrib/sparc64/xminiroot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2002/03/25 07:43:47 lukem Exp $
+#	$NetBSD: Makefile,v 1.14 2002/03/28 04:33:24 lukem Exp $

 TOP=		${.CURDIR}/..
 MINIROOT=	${TOP}/../miniroot
@ -8,7 +8,6 @@ MINIROOT=	${TOP}/../miniroot
 .include <bsd.own.mk>	# So we use /etc/mk.conf.
 .include <bsd.kernobj.mk>

-HACKSRC=	${TOP}/../utils/libhack
 SRCROOT=	${TOP}/../..
 WARNS=1
 INSTKERN?=	${KERNOBJDIR}/INSTALL/netbsd
@ -95,11 +94,10 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	${MAKE} -f ${CBIN}.mk all

-# This is listed in ramdiskbin.conf but is built here.
-${CBIN}: libhack.o
-
 # Use stubs to eliminate some large stuff from libc
-.include "${HACKSRC}/Makefile.inc"
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CBIN}:	libhack.o

 clean cleandir distclean:
 	/bin/rm -f *.core ${AUXCLEAN} ${IMAGE} netbsd.INSTALL ${CBIN} \
--- a/distrib/sun2/ramdisk/Makefile
+++ b/distrib/sun2/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2002/03/26 23:09:40 fredette Exp $
+#	$NetBSD: Makefile,v 1.8 2002/03/28 04:33:24 lukem Exp $

 TOP=		${.CURDIR}/..

@ -70,15 +70,13 @@ unconfig:
 # Rules for making ${CBIN} ...
 .include "${TOP}/common/Make.crunch"

-# This is listed in rd_bin.conf but is built here.
-${CBIN} : libhack.o

 # Use stubs to eliminate some large stuff from libc
-HACKSRC=${TOP}/../utils/libhack
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+HACKOBJS=	gethost.o
+.include	"${HACKSRC}/Makefile.inc"
+${CBIN}:	libhack.o
 CPPFLAGS+=-I${DESTDIR}/usr/include
-.include "${HACKSRC}/Makefile.inc"
-HACKOBJS+=	gethost.o
-libhack.o: gethost.o

 clean cleandir distclean:
 	-rm -f a.out core *.core *.o *.cro *.c
--- a/distrib/sun3/ramdisk/Makefile
+++ b/distrib/sun3/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2002/03/25 07:43:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.25 2002/03/28 04:33:24 lukem Exp $

 TOP=		${.CURDIR}/..

@ -72,13 +72,10 @@ unconfig:
 # Rules for making ${CBIN} ...
 .include "${TOP}/common/Make.crunch"

-# This is listed in rd_bin.conf but is built here.
-${CBIN} : libhack.o
-
 # Use stubs to eliminate some large stuff from libc
-HACKSRC=${TOP}/../utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-HACKOBJS+=	gethost.o
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CBIN}:	libhack.o

 clean cleandir distclean:
 	-rm -f a.out core *.core *.o *.cro *.c
--- a/distrib/utils/libhack/Makefile.inc
+++ b/distrib/utils/libhack/Makefile.inc
@ -1,35 +1,45 @@
-# $NetBSD: Makefile.inc,v 1.14 2002/03/25 07:43:49 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.15 2002/03/28 04:33:24 lukem Exp $
+#
 # Include this fragment to build libhack.o
 # It is .o and not .a to make sure these are the
 # objects you get (and not the ones in libc.a)
+#

-HACKOBJS= getcap.o getgrent.o getnet.o getnetgr.o getpwent.o \
-	localeconv.o perror.o setlocale.o \
-	strerror.o strsignal.o utmp.o yplib.o
+#
+# Required variables:
+#	HACKSRC		This directory
+#
+# Optional variables:
+#	HACKOBJS	Extra objects to build.
+#			The following extra objects are available:
+#			gethost.o	cut-down gethostby{name,addr}()
+#					that only supports /etc/hosts
+#			

-# If a cut-down gethostby{name,addr}() that only supports /etc/hosts
-# is required, add:
-#	HACKOBJS+= gethost.o
+HACKOBJS+=	getcap.o getgrent.o getnet.o getnetgr.o getpwent.o \
+		localeconv.o perror.o setlocale.o \
+		strerror.o strsignal.o utmp.o yplib.o

-libhack.o : $(HACKOBJS)
-	$(LD) -r -o $@ $(HACKOBJS)
+libhack.o: ${HACKOBJS}
+	${LD} -r -o $@ ${HACKOBJS}

 .if ${MACHINE_ARCH} != "sparc64"
 DBG= -Os
 .endif

-# XXX .PATH won't work here, because of crunchgen used in the i386 build

-getcap.o: ${HACKSRC}/getcap.c
-getgrent.o: ${HACKSRC}/getgrent.c
-gethost.o: ${HACKSRC}/gethost.c
-getnet.o: ${HACKSRC}/getnet.c
-getnetgr.o: ${HACKSRC}/getnetgr.c
-getpwent.o: ${HACKSRC}/getpwent.c
-localeconv.o: ${HACKSRC}/localeconv.c
-perror.o: ${HACKSRC}/perror.c
-setlocale.o: ${HACKSRC}/setlocale.c
-strerror.o: ${HACKSRC}/strerror.c
-strsignal.o: ${HACKSRC}/strsignal.c
-utmp.o: ${HACKSRC}/utmp.c
-yplib.o: ${HACKSRC}/yplib.c
+# XXX .PATH won't work here, because of crunchgen used by various builds
+
+getcap.o:	${HACKSRC}/getcap.c
+getgrent.o:	${HACKSRC}/getgrent.c
+gethost.o:	${HACKSRC}/gethost.c
+getnet.o:	${HACKSRC}/getnet.c
+getnetgr.o:	${HACKSRC}/getnetgr.c
+getpwent.o:	${HACKSRC}/getpwent.c
+localeconv.o:	${HACKSRC}/localeconv.c
+perror.o:	${HACKSRC}/perror.c
+setlocale.o:	${HACKSRC}/setlocale.c
+strerror.o:	${HACKSRC}/strerror.c
+strsignal.o:	${HACKSRC}/strsignal.c
+utmp.o:		${HACKSRC}/utmp.c
+yplib.o:	${HACKSRC}/yplib.c
--- a/distrib/vax/ramdisk/Makefile
+++ b/distrib/vax/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2002/03/28 02:15:04 lukem Exp $
+#	$NetBSD: Makefile,v 1.12 2002/03/28 04:33:24 lukem Exp $

 .include "${.CURDIR}/../../Makefile.inc"
 .include <bsd.own.mk>
@ -22,17 +22,15 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${_SRC_TOP_}/etc/services

 # Use stubs to eliminate some large stuff from libc
-HACKSRC=${DISTRIBDIR}/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-
-${CRUNCHBIN}: libhack.o
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CRUNCHBIN}:	libhack.o


 realall: ${IMAGE}

 release:

-
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
 .include "${DISTRIBDIR}/common/Makefile.image"
--- a/distrib/x68k/floppies/ramdisk-common/Makefile.inc
+++ b/distrib/x68k/floppies/ramdisk-common/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.7 2002/03/25 07:43:50 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2002/03/28 04:33:25 lukem Exp $

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

@ -52,11 +52,10 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	${MAKE} -f ${CBIN}.mk all

-# Use size-reduced libhack.
-${CBIN}: libhack.o
-
-HACKSRC=${TOP}/../../utils/libhack
-.include "${HACKSRC}/Makefile.inc"
+# Use stubs to eliminate some large stuff from libc
+HACKSRC=	${DISTRIBDIR}/utils/libhack
+.include	"${HACKSRC}/Makefile.inc"
+${CBIN}:	libhack.o

 # Used in building bootfloppy
 echoimage: