Module Name: src
Committed By: roy
Date: Sun Apr 2 20:18:38 UTC 2017
Modified Files:
src/external/bsd/dhcpcd: Makefile
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks: Makefile
Added Files:
src/external/bsd/dhcpcd/examples: Makefile
src/external/bsd/dhcpcd/examples/hooks: Makefile
Log Message:
Let's make things easier and split the example hooks out into
a new Makefile.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcpcd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/dhcpcd/examples/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/dhcpcd/examples/hooks/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/Makefile:1.2 src/external/bsd/dhcpcd/Makefile:1.3
--- src/external/bsd/dhcpcd/Makefile:1.2 Fri Mar 31 21:02:08 2017
+++ src/external/bsd/dhcpcd/Makefile Sun Apr 2 20:18:37 2017
@@ -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>
Index: src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
diff -u src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.2 src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.3
--- src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.2 Sat Apr 1 19:02:58 2017
+++ src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile Sun Apr 2 20:18:38 2017
@@ -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}
-HOOKS= 01-test 02-dump 20-resolv.conf 30-hostname
-HOOKS+= 50-ntp.conf
+.PATH: ${DIST}/hooks
-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
+FILES= 01-test 02-dump 20-resolv.conf 30-hostname
+FILES+= 50-ntp.conf
-all: ${HOOKS} ${EGHOOKS} ${MKEGHOOKS}
-
-.in: ../../Makefile.inc
- ${TOOL_SED} ${SED_SYS} $< > $@
+FILESDIR= /libexec/dhcpcd-hooks
.include <bsd.prog.mk>
Added files:
Index: src/external/bsd/dhcpcd/examples/Makefile
diff -u /dev/null src/external/bsd/dhcpcd/examples/Makefile:1.1
--- /dev/null Sun Apr 2 20:18:38 2017
+++ src/external/bsd/dhcpcd/examples/Makefile Sun Apr 2 20:18:37 2017
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2017/04/02 20:18:37 roy Exp $
+
+SUBDIR= hooks
+
+.include <bsd.subdir.mk>
Index: src/external/bsd/dhcpcd/examples/hooks/Makefile
diff -u /dev/null src/external/bsd/dhcpcd/examples/hooks/Makefile:1.1
--- /dev/null Sun Apr 2 20:18:38 2017
+++ src/external/bsd/dhcpcd/examples/hooks/Makefile Sun Apr 2 20:18:37 2017
@@ -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>
