[src/trunk]: src/distrib/utils/x_dhclient Make this work with the new dhcp co...

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

details:   https://anonhg.NetBSD.org/src/rev/0babd35978c3
branches:  trunk
changeset: 508100:0babd35978c3
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Apr 06 04:09:55 2001 +0000

description:
Make this work with the new dhcp code -- but the binary is Bigger.
Might require some trimming in the dhcp code itself.

diffstat:

 distrib/utils/x_dhclient/Makefile    |  12 ++++++------
 distrib/utils/x_dhclient/Src-common  |   4 ++--
 distrib/utils/x_dhclient/Src-dst     |   3 +++
 distrib/utils/x_dhclient/Src-minires |   3 ---
 distrib/utils/x_dhclient/Src-omapip  |   8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diffs (76 lines):

diff -r 4358ccdf940a -r 0babd35978c3 distrib/utils/x_dhclient/Makefile
--- a/distrib/utils/x_dhclient/Makefile Fri Apr 06 02:35:08 2001 +0000
+++ b/distrib/utils/x_dhclient/Makefile Fri Apr 06 04:09:55 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2000/12/27 08:12:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2001/04/06 04:09:55 thorpej Exp $
 
 PROG=  dhclient
 MKMAN= no
@@ -7,14 +7,14 @@
 LDSTATIC?=     -static
 
 RSRCDIR= ${.CURDIR}/../../../usr.sbin/dhcp
-.PATH: ${RSRCDIR}/client ${RSRCDIR}/common ${RSRCDIR}/minires ${RSRCDIR}/omapip
+.PATH: ${RSRCDIR}/client ${RSRCDIR}/common ${RSRCDIR}/dst ${RSRCDIR}/omapip
 .NOPATH: ${PROG}
 
 SRCS=  dhclient.c clparse.c
 
-.include "Src-minires"
-MINIOBJS+= ${MINISRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
-SRCS+= ${MINISRCS}
+.include "Src-dst"
+DSTOBJS+= ${DSTSRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
+SRCS+= ${DSTSRCS}
 
 .include "Src-omapip"
 OMOBJS+= ${OMSRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
@@ -31,7 +31,7 @@
 
 all: ${PROG}
 
-${MINIOBJS}:
+${DSTOBJS}:
        ${CC} ${CFLAGS} ${CPPFLAGS} -DMINIRES_LIB -c ${.IMPSRC}
 
 .SUFFIXES: .OM.c
diff -r 4358ccdf940a -r 0babd35978c3 distrib/utils/x_dhclient/Src-common
--- a/distrib/utils/x_dhclient/Src-common       Fri Apr 06 02:35:08 2001 +0000
+++ b/distrib/utils/x_dhclient/Src-common       Fri Apr 06 04:09:55 2001 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Src-common,v 1.4 2000/10/18 18:26:00 tv Exp $
+#      $NetBSD: Src-common,v 1.5 2001/04/06 04:09:55 thorpej 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 alloc.c dns.c execute.c discover.c fddi.c \
-        comapi.c
+        comapi.c ctrace.c
diff -r 4358ccdf940a -r 0babd35978c3 distrib/utils/x_dhclient/Src-dst
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/utils/x_dhclient/Src-dst  Fri Apr 06 04:09:55 2001 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: Src-dst,v 1.1 2001/04/06 04:09:55 thorpej Exp $
+
+DSTSRCS= dst_api.c dst_support.c hmac_link.c prandom.c base64.c
diff -r 4358ccdf940a -r 0babd35978c3 distrib/utils/x_dhclient/Src-minires
--- a/distrib/utils/x_dhclient/Src-minires      Fri Apr 06 02:35:08 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#      $NetBSD: Src-minires,v 1.1 2000/05/12 20:53:22 thorpej Exp $
-
-MINISRCS= dst_api.c hmac_link.c prandom.c support.c base64.c
diff -r 4358ccdf940a -r 0babd35978c3 distrib/utils/x_dhclient/Src-omapip
--- a/distrib/utils/x_dhclient/Src-omapip       Fri Apr 06 02:35:08 2001 +0000
+++ b/distrib/utils/x_dhclient/Src-omapip       Fri Apr 06 04:09:55 2001 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Src-omapip,v 1.3 2000/10/18 18:26:01 tv Exp $
+#      $NetBSD: Src-omapip,v 1.4 2001/04/06 04:09:55 thorpej Exp $
 
-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
+OMSRCS=        array.c 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 mrtrace.c trace.c