Linked ftpget with debug.o and removed lib/debug.c, lib/log.c

diff --git a/ChangeLog b/ChangeLog
index f4c28c4cf3a0e35c86784e4b47b2964220c59b32..8f856ba10c0c9e04855fa2246a3046db2056e7c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,19 +16,26 @@ TODO LIST before official squid-1.1:
 Changes to squid-1.1.beta7 ():
 
        - Combined and renamed comm_set_select_handler() functions.
+       - Fixed netdbPingSite() not checking n->next_ping_time.
+       - Fixed acl.c to use regular gethostbyname() because IP cache
+         isn't initialized while reading config file.
+       - Linked ftpget with debug.o and removed lib/debug.c,
+         lib/log.c.
 
 Changes to squid-1.1.beta6 ():
 
        - Fixed lots of function prototypes, etc (Ed Knowles).
        - Added multicast patch (Martin Hamilton).
-       - Replaced 'struct hostent' with 'struct ipcache_addrs' in IP cache.
+       - Replaced 'struct hostent' with 'struct ipcache_addrs' in IP
+         cache.
        - Added ipcacheCycleAddrs() to round-robin IP addresses.
-       - Added ipcacheRemoveBadAddr() to remove addresses from failed connect()'s.
-       - Changed comm_connect() to comm_nbconnect() and removed other nonblocking
-         connection handling code from other modules.
-       - Improved cache memory usage.  Now cache_mem specifies the size
-         of the in-memory data pool.  Hot objects use whatever space is
-         not used by in-transit objects.
+       - Added ipcacheRemoveBadAddr() to remove addresses from failed
+         connect()'s.
+       - Changed comm_connect() to comm_nbconnect() and removed other
+         nonblocking connection handling code from other modules.
+       - Improved cache memory usage.  Now cache_mem specifies the
+         size of the in-memory data pool.  Hot objects use whatever
+         space is not used by in-transit objects.
        - Removed 'max_hot_object_size' config option.
        - Fixed virtual-host coredump bug (Aaron Hopkins).
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 3b01a30d0b5e0af5a7c18b2e8ca98c019097e627..0645e201c78f3f5edbcf06d3d6ce2dfee7d8dd91 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -3,7 +3,7 @@
 #
 #  Darren Hardy, hardy@cs.colorado.edu, April 1994
 #
-#  $Id: Makefile.in,v 1.14 1996/09/17 02:29:44 wessels Exp $
+#  $Id: Makefile.in,v 1.15 1996/10/13 10:04:20 wessels Exp $
 #
 prefix         = @prefix@
 srcdir         = @srcdir@
@@ -25,8 +25,6 @@ UTILOBJS      = rfc850.o \
                  rfc1738.o \
                  util.o \
                  getfullhostname.o \
-                 debug.o \
-                 log.o \
                  tempnam.o \
                  base64.o \
                  uudecode.o

diff --git a/src/Makefile.in b/src/Makefile.in
index 4526cd1b2ade050f26176caeb662da15df403234..193466c844fbcca9f46753a70f8d0655ebb79fe3 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.45 1996/09/24 18:50:04 wessels Exp $
+#  $Id: Makefile.in,v 1.46 1996/10/13 10:04:21 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -97,7 +97,7 @@ cachemgr.cgi: cachemgr.o
        $(CC) -o $@ $(LDFLAGS) cachemgr.o $(CLIENT_LIBS)
 
 ftpget: ftpget.o
-       $(CC) -o $@ $(LDFLAGS) ftpget.o $(LIBS)
+       $(CC) -o $@ $(LDFLAGS) ftpget.o debug.o $(LIBS)
 
 pinger: pinger.o
        $(CC) -o $@ $(LDFLAGS) pinger.o debug.o $(LIBS)