From: Ted Lemon <source@isc.org>
Date: Thu, 22 Feb 2001 07:27:14 +0000 (+0000)
Subject: Move dst functionality into seperate library
X-Git-Tag: V3-BETA-2-PATCH-18~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=793b7b9f4b1c4e1de7fa16b326024c57c3d17fb5;p=thirdparty%2Fdhcp.git

Move dst functionality into seperate library
---

diff --git a/Makefile.dist b/Makefile.dist
index 578023493..7e4a2fc1d 100644
--- 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 f885e05ef..49e3fc1b3 100644
--- 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 63ca076f9..d6c82e1e4 100755
--- 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 1b34d69f1..e44308b9b 100644
--- 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 bd785b675..814e77ab2 100644
--- 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 a24d2121a..aa49ec102 100644
--- 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 d02f79fac..39605b6b3 100644
--- 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 71a19a270..f6a111fd0 100644
--- 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)