[src/trunk]: src/external/bsd/dhcpcd Let's make things easier and split the e...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1f8592d5af37
branches:  trunk
changeset: 822721:1f8592d5af37
user:      roy <roy%NetBSD.org@localhost>
date:      Sun Apr 02 20:18:37 2017 +0000

description:
Let's make things easier and split the example hooks out into
a new Makefile.

diffstat:

 external/bsd/dhcpcd/Makefile                      |   4 +-
 external/bsd/dhcpcd/examples/Makefile             |   5 +++
 external/bsd/dhcpcd/examples/hooks/Makefile       |  24 +++++++++++++++++
 external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile |  31 +++-------------------
 4 files changed, 36 insertions(+), 28 deletions(-)

diffs (93 lines):

diff -r 36adadc379e7 -r 1f8592d5af37 external/bsd/dhcpcd/Makefile
--- a/external/bsd/dhcpcd/Makefile      Sun Apr 02 20:17:11 2017 +0000
+++ b/external/bsd/dhcpcd/Makefile      Sun Apr 02 20:18:37 2017 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile,v 1.2 2017/03/31 21:02:08 roy Exp $
+#      $NetBSD: Makefile,v 1.3 2017/04/02 20:18:37 roy Exp $
 
-SUBDIR=                sbin libexec
+SUBDIR=                sbin libexec examples
 
 .include <bsd.subdir.mk>
diff -r 36adadc379e7 -r 1f8592d5af37 external/bsd/dhcpcd/examples/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/dhcpcd/examples/Makefile     Sun Apr 02 20:18:37 2017 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2017/04/02 20:18:37 roy Exp $
+
+SUBDIR=                hooks
+
+.include <bsd.subdir.mk>
diff -r 36adadc379e7 -r 1f8592d5af37 external/bsd/dhcpcd/examples/hooks/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/dhcpcd/examples/hooks/Makefile       Sun Apr 02 20:18:37 2017 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2017/04/02 20:18:37 roy Exp $
+#
+
+.include <bsd.own.mk>
+
+.include "../../Makefile.inc"
+.PATH:                 ${DIST}/hooks
+
+.if ${MKSHARE} != "no"
+FILES=                 10-wpa_supplicant 15-timezone 29-lookup-hostname
+FILES+=                        50-ypbind
+
+FILESBUILD_50-ypbind=  YES
+CLEANFILES+=           50-ypbind
+
+FILESDIR=              /usr/share/examples/dhcpcd/hooks
+
+.SUFFIXES:             .in
+
+.in:   ../../Makefile.inc
+       ${TOOL_SED} ${SED_SYS} $< > $@
+.endif
+
+.include <bsd.prog.mk>
diff -r 36adadc379e7 -r 1f8592d5af37 external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
--- a/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile Sun Apr 02 20:17:11 2017 +0000
+++ b/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile Sun Apr 02 20:18:37 2017 +0000
@@ -1,36 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2017/04/01 19:02:58 roy Exp $
+# $NetBSD: Makefile,v 1.3 2017/04/02 20:18:38 roy Exp $
 #
 
 .include <bsd.own.mk>
 
 .include "../../Makefile.inc"
-HOOKSRC=               ${DIST}/hooks
-.PATH:                 ${HOOKSRC} ${OBJDIR}
+
+.PATH:                 ${DIST}/hooks
 
-HOOKS=                 01-test 02-dump 20-resolv.conf 30-hostname
-HOOKS+=                        50-ntp.conf
+FILES=                 01-test 02-dump 20-resolv.conf 30-hostname
+FILES+=                        50-ntp.conf
 
-FILES=                 ${HOOKS:C,^,${HOOKSRC}/,}
 FILESDIR=              /libexec/dhcpcd-hooks
 
-EGHOOKS=               10-wpa_supplicant 15-timezone 29-lookup-hostname
-MKEGHOOKS=             50-ypbind
-CLEANFILES+=           50-ypbind
-
-.if ${MKSHARE} != "no"
-EGFILES=               ${EGHOOKS:C,^,${HOOKSRC}/,}
-EGFILES+=              ${MKEGHOOKS:C,^,${.OBJDIR}/,}
-FILES+=                        ${EGFILES}
-.for f in ${EGFILES}
-FILESDIR_${f}=         /usr/share/examples/dhcpcd/hooks
-.endfor
-.endif
-
-.SUFFIXES:             .in
-
-all:   ${HOOKS} ${EGHOOKS} ${MKEGHOOKS}
-
-.in:   ../../Makefile.inc
-       ${TOOL_SED} ${SED_SYS} $< > $@
-
 .include <bsd.prog.mk>