[src/netbsd-1-5]: src/distrib/utils/x_dhclient Pullup [releng]:

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

details:   https://anonhg.NetBSD.org/src/rev/8fa4a1c55f57
branches:  netbsd-1-5
changeset: 489916:8fa4a1c55f57
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Oct 18 18:27:54 2000 +0000

description:
Pullup [releng]:
Make this compile with the new dhcp.

diffstat:

 distrib/utils/x_dhclient/Makefile   |  14 +++++---------
 distrib/utils/x_dhclient/Src-common |   4 ++--
 distrib/utils/x_dhclient/Src-omapip |   7 ++++---
 3 files changed, 11 insertions(+), 14 deletions(-)

diffs (53 lines):

diff -r 69099ef46db4 -r 8fa4a1c55f57 distrib/utils/x_dhclient/Makefile
--- a/distrib/utils/x_dhclient/Makefile Wed Oct 18 17:51:13 2000 +0000
+++ b/distrib/utils/x_dhclient/Makefile Wed Oct 18 18:27:54 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2.2.2 2000/07/24 15:25:00 itojun Exp $
+#      $NetBSD: Makefile,v 1.2.2.3 2000/10/18 18:27:54 tv Exp $
 
 PROG=  dhclient
 MKMAN= no
@@ -32,15 +32,11 @@
 ${MINIOBJS}:
        ${CC} ${CFLAGS} ${CPPFLAGS} -DMINIRES_LIB -c ${.IMPSRC}
 
-OMalloc.c: ${RSRCDIR}/omapip/alloc.c
-       cp ${RSRCDIR}/omapip/alloc.c OMalloc.c
+.SUFFIXES: .OM.c
 
-OMdispatch.c: ${RSRCDIR}/omapip/dispatch.c
-       cp ${RSRCDIR}/omapip/dispatch.c OMdispatch.c
+.c.OM.c:
+       cp ${RSRCDIR}/omapip/$*.c $@
 
-OMsupport.c: ${RSRCDIR}/omapip/support.c
-       cp ${RSRCDIR}/omapip/support.c OMsupport.c
-
-CLEANFILES+= OMalloc.c OMdispatch.c OMsupport.c
+CLEANFILES+= ${SRCS:M*.OM.c}
 
 .include <bsd.prog.mk>
diff -r 69099ef46db4 -r 8fa4a1c55f57 distrib/utils/x_dhclient/Src-common
--- a/distrib/utils/x_dhclient/Src-common       Wed Oct 18 17:51:13 2000 +0000
+++ b/distrib/utils/x_dhclient/Src-common       Wed Oct 18 18:27:54 2000 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Src-common,v 1.3 2000/06/12 02:36:19 jtk Exp $
+#      $NetBSD: Src-common,v 1.3.2.1 2000/10/18 18:27:54 tv Exp $
 
 COMSRCS= parse.c dispatch.c conflex.c bpf.c socket.c packet.c \
         ethernet.c memory.c print.c options.c inet.c convert.c \
-        tree.c tables.c hash.c alloc.c dns.c execute.c discover.c fddi.c \
+        tree.c tables.c alloc.c dns.c execute.c discover.c fddi.c \
         comapi.c
diff -r 69099ef46db4 -r 8fa4a1c55f57 distrib/utils/x_dhclient/Src-omapip
--- a/distrib/utils/x_dhclient/Src-omapip       Wed Oct 18 17:51:13 2000 +0000
+++ b/distrib/utils/x_dhclient/Src-omapip       Wed Oct 18 18:27:54 2000 +0000
@@ -1,4 +1,5 @@
-#      $NetBSD: Src-omapip,v 1.1 2000/05/12 20:53:22 thorpej Exp $
+#      $NetBSD: Src-omapip,v 1.1.4.1 2000/10/18 18:27:54 tv Exp $
 
-OMSRCS=        protocol.c buffer.c OMalloc.c result.c connection.c errwarn.c \
-       listener.c OMdispatch.c generic.c OMsupport.c handle.c message.c
+OMSRCS=        auth.c protocol.c buffer.c alloc.OM.c result.c connection.c errwarn.c \
+       listener.c dispatch.OM.c generic.c support.OM.c handle.c message.c \
+       hash.OM.c