[src/trunk]: src/usr.sbin Use PRINTOBJDIR.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.sbin Use PRINTOBJDIR.
From: enami <enami%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 08:26:10 +0000
details:   https://anonhg.NetBSD.org/src/rev/017ef22a14e7
branches:  trunk
changeset: 501769:017ef22a14e7
user:      enami <enami%NetBSD.org@localhost>
date:      Sun Jan 07 08:00:54 2001 +0000

description:
Use PRINTOBJDIR.

diffstat:

 usr.sbin/amd/Makefile.inc         |   9 ++++-----
 usr.sbin/amd/amd/Makefile         |   5 ++---
 usr.sbin/amd/fsinfo/Makefile      |   5 ++---
 usr.sbin/bind/Makefile.inc        |   8 ++++----
 usr.sbin/bootp/Makefile.inc       |   7 ++++---
 usr.sbin/dhcp/Makefile.inc        |  11 +++++------
 usr.sbin/lpr/Makefile.inc         |   7 ++++---
 usr.sbin/mopd/Makefile.inc        |   7 ++++---
 usr.sbin/pkg_install/Makefile.inc |   9 +++------
 usr.sbin/sup/Makefile.inc         |   7 ++++---
 usr.sbin/ypserv/Makefile.inc      |   7 ++++---
 11 files changed, 40 insertions(+), 42 deletions(-)

diffs (205 lines):

diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/amd/Makefile.inc
--- a/usr.sbin/amd/Makefile.inc Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/amd/Makefile.inc Sun Jan 07 08:00:54 2001 +0000
@@ -1,18 +1,17 @@
-#      $NetBSD: Makefile.inc,v 1.15 2000/11/21 02:03:26 wiz Exp $
+#      $NetBSD: Makefile.inc,v 1.16 2001/01/07 08:00:57 enami Exp $
 
 WARNS?=        1
 WFORMAT=2
 
+.include <bsd.own.mk>
+
 IDIST= ${.CURDIR}/../../../dist/am-utils
 
-LIBAMUOBJDIR!=cd ${.CURDIR}/../libamu; \
-       printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+LIBAMUOBJDIR!=cd ${.CURDIR}/../libamu && ${PRINTOBJDIR}
 
 CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../include -I${IDIST}/libamu \
        -I${IDIST}/include -I${LIBAMUOBJDIR}
 
-.include <bsd.own.mk>
-
 .if !defined(LIB) || empty(LIB)
 LDADD+=        -L${LIBAMUOBJDIR} -lamu
 .if ${MKPIC} == "no"
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/amd/amd/Makefile
--- a/usr.sbin/amd/amd/Makefile Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/amd/amd/Makefile Sun Jan 07 08:00:54 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2000/11/20 00:24:42 wiz Exp $
+#      $NetBSD: Makefile,v 1.19 2001/01/07 08:00:54 enami Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -22,8 +22,7 @@
 #      info_ldap.c info_nisplus.c ops_cachefs.c ops_efs.c ops_lofs.c ops_xfs.c
 MAN+=  amd.8
 
-AMDOBJDIR!=cd ${.CURDIR}; \
-       printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+AMDOBJDIR!=cd ${.CURDIR} && ${PRINTOBJDIR}
 
 CPPFLAGS+=     -I${DIST} -I${AMDOBJDIR}
 LDADD+=                ${LIBAMU} -lrpcsvc
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/amd/fsinfo/Makefile
--- a/usr.sbin/amd/fsinfo/Makefile      Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/amd/fsinfo/Makefile      Sun Jan 07 08:00:54 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2000/11/20 00:25:07 wiz Exp $
+#      $NetBSD: Makefile,v 1.17 2001/01/07 08:00:56 enami Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -12,8 +12,7 @@
 MAN+=  fsinfo.8
 
 
-FSINFOOBJDIR!=cd ${.CURDIR}; \
-       printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+FSINFOOBJDIR!=cd ${.CURDIR} && ${PRINTOBJDIR}
 
 CPPFLAGS+=     -I${DIST} -I${FSINFOOBJDIR}
 YHEADER=       1
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/bind/Makefile.inc
--- a/usr.sbin/bind/Makefile.inc        Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/bind/Makefile.inc        Sun Jan 07 08:00:54 2001 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.7 2000/10/11 20:23:48 is Exp $
+# $NetBSD: Makefile.inc,v 1.8 2001/01/07 08:00:57 enami Exp $
+
+.include <bsd.own.mk>
 
 WARNS=0
 WFORMAT=2
@@ -11,8 +13,6 @@
 PIDFILE=       /var/run/named.pid
 PS=            ps
 
-LIB_BIND!=     cd ${BIND_DIR}/lib; \
-               printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | \
-               ${MAKE} -s -f -
+LIB_BIND!=     cd ${BIND_DIR}/lib && ${PRINTOBJDIR}
 INCLUDE?=      -I${LIB_BIND} -I${.OBJDIR} -I${BIND_DIST_DIR}/include
 LIBRARY?=      -L${LIB_BIND} -lbind
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/bootp/Makefile.inc
--- a/usr.sbin/bootp/Makefile.inc       Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/bootp/Makefile.inc       Sun Jan 07 08:00:54 2001 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile.inc,v 1.1 1998/03/15 01:13:25 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2001/01/07 08:00:58 enami Exp $
 
-LIBCOMMON != cd ${.CURDIR}/../common;\
-    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+.include <bsd.own.mk>
+
+LIBCOMMON != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 CPPFLAGS+=-I${.CURDIR}/../common
 DPADD+=        ${LIBCOMMON}/libcommon.a
 LDADD+=        -L${LIBCOMMON} -lcommon
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/dhcp/Makefile.inc
--- a/usr.sbin/dhcp/Makefile.inc        Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/dhcp/Makefile.inc        Sun Jan 07 08:00:54 2001 +0000
@@ -32,12 +32,11 @@
 
 WARNS?=        0
 
-COBJDIR!=cd $(.CURDIR)/../common; \
-       printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-OMOBJDIR!=cd $(.CURDIR)/../omapip; \
-       printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-MROBJDIR!=cd $(.CURDIR)/../minires; \
-       printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+.include <bsd.own.mk>
+
+COBJDIR!=cd $(.CURDIR)/../common && ${PRINTOBJDIR}
+OMOBJDIR!=cd $(.CURDIR)/../omapip && ${PRINTOBJDIR}
+MROBJDIR!=cd $(.CURDIR)/../minires && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../includes
 LDADD=  ${OMOBJDIR}/libomapi.a ${COBJDIR}/libdhcp.a ${MROBJDIR}/libminires.a
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/lpr/Makefile.inc
--- a/usr.sbin/lpr/Makefile.inc Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/lpr/Makefile.inc Sun Jan 07 08:00:54 2001 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile.inc,v 1.4 1997/10/25 06:58:19 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2001/01/07 08:00:58 enami Exp $
 
-LIBCOMMON != cd ${.CURDIR}/../common_source;\
-    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+.include <bsd.own.mk>
+
+LIBCOMMON != cd ${.CURDIR}/../common_source && ${PRINTOBJDIR}
 CPPFLAGS+=-I${.CURDIR}/../common_source
 DPADD+=        ${LIBCOMMON}/libcommon.a
 LDADD+=        -L${LIBCOMMON} -lcommon
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/mopd/Makefile.inc
--- a/usr.sbin/mopd/Makefile.inc        Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/mopd/Makefile.inc        Sun Jan 07 08:00:54 2001 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile.inc,v 1.8 1997/10/25 06:58:22 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.9 2001/01/07 08:00:58 enami Exp $
 
-LIBCOMMON != cd ${.CURDIR}/../common;\
-    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+.include <bsd.own.mk>
+
+LIBCOMMON != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 CPPFLAGS+=-I${.CURDIR}/../common
 DPADD+=        ${LIBKVM} ${LIBCOMMON}/libcommon.a
 LDADD+=        -lkvm -L${LIBCOMMON} -lcommon
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/pkg_install/Makefile.inc
--- a/usr.sbin/pkg_install/Makefile.inc Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/pkg_install/Makefile.inc Sun Jan 07 08:00:54 2001 +0000
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.13 2000/10/27 11:49:23 hubertf Exp $
+# $NetBSD: Makefile.inc,v 1.14 2001/01/07 08:00:58 enami Exp $
 # Original from FreeBSD, no rcs id.
 
-.if exists(/etc/mk.conf)
-.include "/etc/mk.conf"
-.endif
+.include <bsd.own.mk>
 
-LIBINSTALL != cd ${.CURDIR}/../lib;\
-    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+LIBINSTALL != cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
 CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG} -DBINDIR='"${BINDIR}"'
 
 .if !defined(OPSYS)
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/sup/Makefile.inc
--- a/usr.sbin/sup/Makefile.inc Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/sup/Makefile.inc Sun Jan 07 08:00:54 2001 +0000
@@ -1,12 +1,13 @@
-#      $NetBSD: Makefile.inc,v 1.6 2000/07/19 07:52:44 enami Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2001/01/07 08:00:57 enami Exp $
+
+.include <bsd.own.mk>
 
 CPPFLAGS+=-UCMUCS -UCMU -UMACH -DVAR_TMP -DHAS_DAEMON -DHAS_POSIX_DIR \
     -DLIBWRAP -DHAS_FPARSELN
 CPPFLAGS+=-I${.CURDIR}/../source -I${.CURDIR}/../lib -I${.CURDIR}/../sys
 CPPFLAGS+=-DEE_XXX
 
-LIBSUPDIR != cd ${.CURDIR}/../lib;\
-    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+LIBSUPDIR != cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
 LIBSUP=        ${LIBSUPDIR}/libsup.a
 SUPLIB=        -L${LIBSUPDIR} -lsup
 
diff -r fa9645597d23 -r 017ef22a14e7 usr.sbin/ypserv/Makefile.inc
--- a/usr.sbin/ypserv/Makefile.inc      Sun Jan 07 07:29:33 2001 +0000
+++ b/usr.sbin/ypserv/Makefile.inc      Sun Jan 07 08:00:54 2001 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile.inc,v 1.5 1998/06/08 06:53:47 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2001/01/07 08:00:58 enami Exp $
 
-LIBCOMMON != cd ${.CURDIR}/../common;\
-    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+.include <bsd.own.mk>
+
+LIBCOMMON != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 CPPFLAGS+=-I${.CURDIR}/../common
 DPADD+=        ${LIBCOMMON}/libcommon.a ${LIBUTIL}
 LDADD+=        -L${LIBCOMMON} -lcommon -lutil
Prev by Date: [src/trunk]: src/share Argh.. I forgot to enable the sushi subdir in this Mak...
Next by Date: [src/trunk]: src/sys/arch/hpcmips/dev Add some definitions.
Previous by Thread: [src/trunk]: src/share Argh.. I forgot to enable the sushi subdir in this Mak...
Next by Thread: [src/trunk]: src/sys/arch/hpcmips/dev Add some definitions.
Indexes:
Home | Main Index | Thread Index | Old Index