From 3935db0f04b359bec3dba46dec5c32aa5c20e9aa Mon Sep 17 00:00:00 2001
From: David Lawrence <source@isc.org>
Date: Mon, 24 Apr 2000 21:47:34 +0000
Subject: [PATCH] Include {os}/file.o in libisc.a.

No longer include {os}/ufile.o and {os}/mktemplate.o in libisc.a.
---
 lib/isc/Makefile.in       | 11 ++++++-----
 lib/isc/unix/Makefile.in  |  8 ++++----
 lib/isc/win32/Makefile.in |  6 ++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index bb5a1c142c..19e16fb733 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -30,17 +30,18 @@ CWARNINGS =
 
 # Alphabetically
 UNIXOBJS =	@ISC_ISCIPV6_O@ \
-		unix/app.@O@ unix/dir.@O@ unix/interfaceiter.@O@ \
-		unix/mktemplate.@O@ unix/net.@O@ unix/socket.@O@ \
-		unix/time.@O@ unix/stdtime.@O@ unix/ufile.@O@
+		unix/app.@O@ unix/dir.@O@ unix/file.@O@ \
+		unix/interfaceiter.@O@ unix/net.@O@ unix/socket.@O@ \
+		unix/time.@O@ unix/stdtime.@O@
 
 
 NLSOBJS =	nls/msgcat.@O@
 
 PTHREADOBJS =	pthreads/condition.@O@ pthreads/thread.@O@
 
-WIN32OBJS = 	win32/condition.@O@ win32/dir.@O@ win32/once.@O@ \
-		win32/stdtime.@O@ win32/thread.@O@ win32/time.@O@
+WIN32OBJS = 	win32/condition.@O@ win32/dir.@O@ win32/file.@O@ \
+		win32/once.@O@ win32/stdtime.@O@ win32/thread.@O@ \
+		win32/time.@O@
 
 # Alphabetically
 OBJS =		@ISC_EXTRA_OBJS@ \
diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in
index a6fae6a002..363363d886 100644
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/Makefile.in
@@ -28,13 +28,13 @@ CWARNINGS =
 
 # Alphabetically
 OBJS =		@ISC_IPV6_O@ \
-		app.@O@ dir.@O@ interfaceiter.@O@ mktemplate.@O@ net.@O@ \
-		socket.@O@ stdtime.@O@ time.@O@ ufile.@O@
+		app.@O@ dir.@O@ file.@O@ interfaceiter.@O@ net.@O@ \
+		socket.@O@ stdtime.@O@ time.@O@
 
 # Alphabetically
 SRCS =		@ISC_IPV6_C@ \
-		app.c dir.c interfaceiter.c mktemplate.c net.c socket.c \
-		stdtime.c time.c ufile.c
+		app.c dir.c file.c interfaceiter.c net.c \
+		socket.c stdtime.c time.c ufile.c
 
 SUBDIRS =	include
 TARGETS =	${OBJS}
diff --git a/lib/isc/win32/Makefile.in b/lib/isc/win32/Makefile.in
index 13639045d1..43bf6fef47 100644
--- a/lib/isc/win32/Makefile.in
+++ b/lib/isc/win32/Makefile.in
@@ -25,10 +25,12 @@ CDEFINES =
 CWARNINGS =
 
 # Alphabetically
-OBJS =		condition.@O@ dir.@O@ once.@O@ stdtime.@O@ thread.@O@ time.@O@
+OBJS =		condition.@O@ dir.@O@ file.@O@ once.@O@ stdtime.@O@ \
+		thread.@O@ time.@O@
 
 # Alphabetically
-SRCS =		condition.c dir.c once.c stdtime.c thread.c time.c
+SRCS =		condition.c dir.c file.c once.c stdtime.c \
+		thread.c time.c
 
 SUBDIRS =	include
 TARGETS =	${OBJS}