Module Name: src
Committed By: roy
Date: Fri Sep 13 11:58:32 UTC 2019
Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
No longer any need to build the dhcpcd embedded configuration files
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/external/bsd/dhcpcd/sbin/dhcpcd/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/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.48 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.49
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.48 Fri Jul 26 10:49:06 2019
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Sep 13 11:58:32 2019
@@ -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+= if.c if-options.c route.c sa.c s
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 @@ CPPFLAGS+= -DDHCP6
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 @@ FILESMODE_dhcpcd.conf= 644 # -rw-r--r--
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 > $@
