details: https://anonhg.NetBSD.org/src/rev/386478b19444
branches: trunk
changeset: 454300:386478b19444
user: roy <roy%NetBSD.org@localhost>
date: Fri Sep 13 11:58:32 2019 +0000
description:
No longer any need to build the dhcpcd embedded configuration files
diffstat:
external/bsd/dhcpcd/sbin/dhcpcd/Makefile | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diffs (52 lines):
diff -r cdeee6bc7061 -r 386478b19444 external/bsd/dhcpcd/sbin/dhcpcd/Makefile
--- a/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Sep 13 11:54:03 2019 +0000
+++ b/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Sep 13 11:58:32 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/07/26 10:49:06 roy Exp $
+# $NetBSD: Makefile,v 1.49 2019/09/13 11:58:32 roy Exp $
#
WARNS?= 6
@@ -13,18 +13,13 @@
SRCS+= dhcp-common.c dhcpcd-embedded.c
SRCS+= if-bsd.c
-# Need to generate this for dependencies
-DPSRCS+= dhcpcd-embedded.h dhcpcd-embedded.c
-
CPPFLAGS+= -DHAVE_CONFIG_H -D_OPENBSD_SOURCE
USE_INET?= yes
.if defined(SMALLPROG)
CPPFLAGS+= -DSMALL
-DHCPCD_DEFS= dhcpcd-definitions-small.conf
.else
-DHCPCD_DEFS= dhcpcd-definitions.conf
CPPFLAGS+= -DAUTH
SRCS+= auth.c
.endif
@@ -50,7 +45,7 @@
SRCS+= dhcp6.c
.endif
-CPPFLAGS+= -I${SRCDIR}/include -I${DIST}/src -I${.OBJDIR}
+CPPFLAGS+= -I${SRCDIR}/include -I${DIST}/src
DPADD+= ${LIBUTIL}
LDADD+= -lutil
@@ -64,14 +59,6 @@
MAN= dhcpcd.conf.5 dhcpcd.8
CLEANFILES= dhcpcd.conf.5 dhcpcd.8
-dhcpcd-embedded.h: genembedh ${DHCPCD_DEFS} dhcpcd-embedded.h.in
- ${HOST_SH} ${.ALLSRC} $^ > $@
-
-dhcpcd-embedded.c: genembedc ${DHCPCD_DEFS} dhcpcd-embedded.c.in
- ${HOST_SH} ${.ALLSRC} $^ > $@
-
-CLEANFILES+= dhcpcd-embedded.c dhcpcd-embedded.h
-
.for f in dhcpcd.conf.5 dhcpcd.8
${f}: ${f}.in
${TOOL_SED} ${SED_SYS} ${DIST}/src/${f}.in > $@