Move dst functionality into seperate library

diff --git a/Makefile.dist b/Makefile.dist
index 5780234934d139df5470fbfc9811bd9c133c46d0..7e4a2fc1d10e11e9402364ffda5ee5c4aa5f3fd8 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -17,7 +17,7 @@
 # http://www.isc.org for more information.
 #
 
-SUBDIRS=       common $(MINIRES) omapip server client relay dhcpctl
+SUBDIRS=       common $(MINIRES) dst omapip server client relay dhcpctl
 
 all:
        @for dir in ${SUBDIRS}; do \

diff --git a/client/Makefile.dist b/client/Makefile.dist
index f885e05ef11205d9c9307b6e129c65f20b797b96..49e3fc1b3418360a374b10abb320d26da53a0451 100644 (file)
--- a/client/Makefile.dist
+++ b/client/Makefile.dist
@@ -28,7 +28,7 @@ MAN    = dhclient.8 dhclient.conf.5 dhclient-script.8 dhclient.leases.5
 
 DEBUG  = -g
 INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
-DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
+DHCPLIB = ../common/libdhcp.a $(BINDLIB) ../omapip/libomapi.a ../dst/libdst.a
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \
                -DCLIENT_PATH=${CLIENT_PATH}
 

diff --git a/configure b/configure
index 63ca076f9d1b1cadb9a8415bc9a290c33ec377e1..d6c82e1e467d9f7f3fdaa09c9da9f0f202233b67 100755 (executable)
--- a/configure
+++ b/configure
@@ -172,7 +172,7 @@ if [ ! -d $workname ]; then
   mkdir $workname
 fi
 
-for foo in . client server relay common omapip dhcpctl minires; do
+for foo in . client server relay common omapip dhcpctl minires dst; do
        if [ ! -d ${workname}/$foo ]; then
          mkdir ${workname}/$foo
        fi

diff --git a/dhcpctl/Makefile.dist b/dhcpctl/Makefile.dist
index 1b34d69f1f614c8c8396b5234688545776ee2b98..e44308b9ba02749ebd9ca25e66a27a5d52dd590a 100644 (file)
--- a/dhcpctl/Makefile.dist
+++ b/dhcpctl/Makefile.dist
@@ -27,17 +27,16 @@ HDRS   = dhcpctl.h
 DEBUG  = -g
 INCLUDES = $(BINDINC) -I$(TOP)/includes
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
+               ../omapip/libomapi.a ../dst/libdst.a
 
 all:   libdhcpctl.a omshell cltest $(CATMANPAGES)
 
-omshell:       omshell.o libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
-       $(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o libdhcpctl.a \
-                       ../common/libdhcp.a \
-                       ../omapip/libomapi.a $(BINDLIB) $(LIBS)
+omshell:       omshell.o $(DHCPCTLLIBS)
+       $(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS)
 
-cltest:        cltest.o libdhcpctl.a ../omapip/libomapi.a $(BINDLIB)
-       $(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o libdhcpctl.a \
-                       ../omapip/libomapi.a $(BINDLIB) $(LIBS)
+cltest:        cltest.o $(DHCPCTLLIBS)
+       $(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS)
 
 libdhcpctl.a:  $(OBJ)
        rm -f libdhcpctl.a

diff --git a/minires/Makefile.dist b/minires/Makefile.dist
index bd785b675396ee5ac2e20c9391fee97262ca7019..814e77ab277eb64f8e123c1bbf77646e43059871 100644 (file)
--- a/minires/Makefile.dist
+++ b/minires/Makefile.dist
@@ -23,14 +23,11 @@ MAN    = dhcpctl.3
 SRC    = res_mkupdate.c res_init.c res_update.c res_send.c res_comp.c \
         res_sendsigned.c res_findzonecut.c res_query.c res_mkquery.c \
         ns_date.c ns_parse.c ns_sign.c ns_name.c ns_samedomain.c ns_verify.c \
-        dst_api.c hmac_link.c md5_dgst.c prandom.c support.c base64.c \
         toisc.c
 OBJ    = res_mkupdate.o res_init.o res_update.o res_send.o res_comp.o \
         res_sendsigned.o res_findzonecut.o res_query.o res_mkquery.o \
         ns_date.o ns_parse.o ns_sign.o ns_name.o ns_samedomain.o ns_verify.o \
-        dst_api.o hmac_link.o md5_dgst.o prandom.o support.o base64.o \
         toisc.o
-HDRS   = dst_internal.h md5.h md5_locl.h
 
 DEBUG  = -g
 INCLUDES = $(BINDINC) -I$(TOP)/includes

diff --git a/omapip/Makefile.dist b/omapip/Makefile.dist
index a24d2121a2287f18d85a68534aa43668eab526b8..aa49ec1028f86a80c94b787bde25578a729c718d 100644 (file)
--- a/omapip/Makefile.dist
+++ b/omapip/Makefile.dist
@@ -33,8 +33,9 @@ CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
 all:   libomapi.a svtest $(CATMANPAGES)
 
-svtest:        test.o libomapi.a $(BINDLIB)
-       $(CC) $(DEBUG) $(LFLAGS) -o svtest test.o libomapi.a $(BINDLIB) $(LIBS)
+svtest:        test.o libomapi.a $(BINDLIB) ../dst/libdst.a
+       $(CC) $(DEBUG) $(LFLAGS) -o svtest test.o $(BINDLIB) \
+                       libomapi.a ../dst/libdst.a $(LIBS)
 
 libomapi.a:    $(OBJ)
        rm -f libomapi.a

diff --git a/relay/Makefile.dist b/relay/Makefile.dist
index d02f79facdf011e8885fdfff90ae040ff6ae6c78..39605b6b354c436afb16cdd325f7fbf3fff62d0b 100644 (file)
--- a/relay/Makefile.dist
+++ b/relay/Makefile.dist
@@ -26,7 +26,7 @@ MAN    = dhcrelay.8
 
 DEBUG  = -g
 INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
-DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
+DHCPLIB = ../common/libdhcp.a $(BINDLIB) ../omapip/libomapi.a ../dst/libdst.a
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
 all:   $(PROG) $(CATMANPAGES)

diff --git a/server/Makefile.dist b/server/Makefile.dist
index 71a19a27096fa6c13afb53062380d4db5f985810..f6a111fd0fbba1434e7487b82b326bfe49143536 100644 (file)
--- a/server/Makefile.dist
+++ b/server/Makefile.dist
@@ -28,7 +28,7 @@ MAN    = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 
 DEBUG  = -g
 INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
-DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
+DHCPLIB = ../common/libdhcp.a $(BINDLIB) ../omapip/libomapi.a ../dst/libdst.a
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
 all:   $(PROG) $(CATMANPAGES)