INN commit: branches/2.5 (11 files)

INN Commit rra at isc.org
Wed Jan 7 21:04:12 UTC 2015


    Date: Wednesday, January 7, 2015 @ 13:04:11
  Author: iulius
Revision: 9781

Regenerate Makefile dependencies with gcc 4.7.2

Also adapt support/makedepend to keep the two leading spaces, as in
previous versions of gcc.

Backport commit [9566].

Modified:
  branches/2.5/authprogs/Makefile
  branches/2.5/backends/Makefile
  branches/2.5/expire/Makefile
  branches/2.5/frontends/Makefile
  branches/2.5/history/Makefile
  branches/2.5/innd/Makefile
  branches/2.5/innfeed/Makefile
  branches/2.5/lib/Makefile
  branches/2.5/nnrpd/Makefile
  branches/2.5/storage/Makefile
  branches/2.5/support/makedepend

--------------------+
 authprogs/Makefile |   30 +++----
 backends/Makefile  |   40 ++++-----
 expire/Makefile    |   35 +++-----
 frontends/Makefile |   40 ++++-----
 history/Makefile   |   17 +---
 innd/Makefile      |  205 +++++++++++++++++++++++----------------------------
 innfeed/Makefile   |   53 ++++++-------
 lib/Makefile       |   60 ++++++--------
 nnrpd/Makefile     |  179 +++++++++++++++++++++-----------------------
 storage/Makefile   |  122 ++++++++++++------------------
 support/makedepend |    4 
 11 files changed, 360 insertions(+), 425 deletions(-)

Modified: authprogs/Makefile
===================================================================
--- authprogs/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ authprogs/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -81,38 +81,36 @@
 auth_krb5.o: auth_krb5.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h libauth.h ../include/portable/socket.h \
-  ../include/config.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/libinn.h
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/defines.h ../include/inn/messages.h \
+  ../include/inn/libinn.h
 ckpasswd.o: ckpasswd.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
   ../include/inn/qio.h ../include/inn/vector.h ../include/inn/libinn.h \
-  libauth.h ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
+  libauth.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h
 domain.o: domain.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
   ../include/inn/libinn.h libauth.h ../include/portable/socket.h \
-  ../include/config.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
 ident.o: ident.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
   ../include/inn/network.h ../include/inn/libinn.h libauth.h \
-  ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h
 libauth.o: libauth.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/inn/messages.h ../include/inn/defines.h libauth.h \
   ../include/inn/libinn.h
 radius.o: radius.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/time.h ../include/config.h \
-  ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/md5.h \
-  ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/conffile.h libauth.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h
+  ../include/config.h ../include/portable/time.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/md5.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
+  ../include/conffile.h libauth.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h

Modified: backends/Makefile
===================================================================
--- backends/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ backends/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -132,17 +132,16 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 actsync.o: actsync.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/wait.h ../include/config.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/hashtab.h ../include/inn/qio.h \
-  ../include/inn/libinn.h ../include/inn/paths.h
+  ../include/config.h ../include/portable/wait.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h \
+  ../include/inn/hashtab.h ../include/inn/qio.h ../include/inn/libinn.h \
+  ../include/inn/paths.h
 archive.o: archive.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/buffer.h ../include/inn/defines.h \
   ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/qio.h \
   ../include/inn/vector.h ../include/inn/wire.h ../include/inn/libinn.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
 batcher.o: batcher.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
@@ -163,15 +162,15 @@
 filechan.o: filechan.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/paths.h map.h
+  ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/paths.h \
+  map.h
 innbind.o: innbind.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/newsuser.h ../include/config.h \
-  ../include/clibrary.h ../include/inn/vector.h
+  ../include/inn/messages.h ../include/inn/newsuser.h \
+  ../include/inn/vector.h
 inndf.o: inndf.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
@@ -180,21 +179,20 @@
   ../include/inn/libinn.h ../include/inn/paths.h
 innxbatch.o: innxbatch.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/portable/time.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/messages.h \
   ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h
 innxmit.o: innxmit.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/portable/time.h ../include/inn/history.h \
   ../include/inn/defines.h ../include/inn/innconf.h \
   ../include/inn/messages.h ../include/inn/qio.h ../include/inn/timer.h \
   ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
 map.o: map.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
@@ -204,7 +202,7 @@
   ../include/config.h
 nntpget.o: nntpget.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/portable/time.h ../include/inn/history.h \
   ../include/inn/defines.h ../include/inn/innconf.h \
@@ -212,11 +210,11 @@
   ../include/inn/paths.h
 overchan.o: overchan.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/time.h ../include/config.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/overview.h \
-  ../include/inn/storage.h ../include/inn/options.h ../include/inn/qio.h \
-  ../include/inn/libinn.h ../include/inn/paths.h
+  ../include/config.h ../include/portable/time.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h \
+  ../include/inn/overview.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/qio.h ../include/inn/libinn.h \
+  ../include/inn/paths.h
 shlock.o: shlock.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/messages.h ../include/inn/defines.h

Modified: expire/Makefile
===================================================================
--- expire/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ expire/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -97,17 +97,15 @@
   ../include/config.h ../include/inn/history.h ../include/inn/defines.h \
   ../include/inn/innconf.h ../include/inn/messages.h \
   ../include/inn/inndcomm.h ../include/inn/libinn.h \
-  ../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h
+  ../include/inn/newsuser.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h
 expireover.o: expireover.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/libinn.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/history.h ../include/inn/paths.h ../include/inn/qio.h \
-  ../include/inn/storage.h
+  ../include/inn/newsuser.h ../include/inn/ov.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/history.h ../include/inn/paths.h \
+  ../include/inn/qio.h ../include/inn/storage.h
 fastrm.o: fastrm.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
@@ -117,27 +115,24 @@
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/inn/history.h \
   ../include/inn/defines.h ../include/inn/innconf.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h
+  ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h
 makedbz.o: makedbz.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/dbz.h ../include/inn/libinn.h \
   ../include/inn/defines.h ../include/inn/innconf.h \
-  ../include/inn/libinn.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
+  ../include/inn/messages.h ../include/inn/newsuser.h \
   ../include/inn/paths.h ../include/inn/qio.h ../include/inn/storage.h \
   ../include/inn/options.h
 makehistory.o: makehistory.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/wait.h ../include/config.h \
-  ../include/inn/buffer.h ../include/inn/defines.h \
-  ../include/inn/history.h ../include/inn/innconf.h \
-  ../include/inn/libinn.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/history.h ../include/inn/paths.h ../include/inn/qio.h \
-  ../include/inn/storage.h ../include/inn/vector.h ../include/inn/wire.h
+  ../include/config.h ../include/portable/wait.h ../include/inn/buffer.h \
+  ../include/inn/defines.h ../include/inn/history.h \
+  ../include/inn/innconf.h ../include/inn/libinn.h \
+  ../include/inn/messages.h ../include/inn/newsuser.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/options.h ../include/inn/paths.h \
+  ../include/inn/qio.h ../include/inn/storage.h ../include/inn/vector.h \
+  ../include/inn/wire.h
 prunehistory.o: prunehistory.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \

Modified: frontends/Makefile
===================================================================
--- frontends/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ frontends/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -155,10 +155,9 @@
   ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/paths.h
 inews.o: inews.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/time.h ../include/config.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
+  ../include/config.h ../include/portable/time.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/messages.h ../include/inn/newsuser.h \
   ../include/inn/nntp.h ../include/inn/paths.h
 innconfval.o: innconfval.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -175,38 +174,35 @@
 ovdb_monitor.o: ovdb_monitor.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/setproctitle.h ../include/config.h \
-  ../include/portable/wait.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/history.h \
-  ../storage/ovdb/ovdb.h ../storage/ovdb/ovdb-private.h
+  ../include/portable/setproctitle.h ../include/portable/wait.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/history.h ../storage/ovdb/ovdb.h \
+  ../storage/ovdb/ovdb-private.h
 ovdb_server.o: ovdb_server.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/mmap.h ../include/config.h \
+  ../include/config.h ../include/portable/mmap.h \
   ../include/portable/time.h ../include/portable/setproctitle.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/portable/wait.h \
   ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/history.h ../storage/ovdb/ovdb.h \
+  ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h ../storage/ovdb/ovdb.h \
   ../storage/ovdb/ovdb-private.h
 ovdb_stat.o: ovdb_stat.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/ov.h \
   ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/history.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../storage/ovdb/ovdb.h \
-  ../storage/ovdb/ovdb-private.h
+  ../include/inn/history.h ../include/inn/paths.h ../include/inn/storage.h \
+  ../storage/ovdb/ovdb.h ../storage/ovdb/ovdb-private.h
 rnews.o: rnews.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/wait.h ../include/config.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
+  ../include/config.h ../include/portable/wait.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/messages.h ../include/inn/newsuser.h \
   ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/wire.h
 sm.o: sm.c ../include/config.h ../include/inn/defines.h \

Modified: history/Makefile
===================================================================
--- history/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ history/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -95,19 +95,18 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 his.o: his.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/time.h ../include/config.h \
-  ../include/inn/history.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/timer.h \
-  ../include/inn/libinn.h ../include/inn/storage.h \
+  ../include/config.h ../include/portable/time.h ../include/inn/history.h \
+  ../include/inn/defines.h ../include/inn/messages.h \
+  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/storage.h \
   ../include/inn/options.h hisinterface.h hismethods.h
 hismethods.o: hismethods.c hisinterface.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h hismethods.h hisv6/hisv6.h
 hisv6/hisv6.o: hisv6/hisv6.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h hisinterface.h ../include/config.h hisv6/hisv6.h \
-  hisv6/hisv6-private.h ../include/inn/history.h ../include/inn/defines.h \
+  ../include/config.h hisinterface.h hisv6/hisv6.h hisv6/hisv6-private.h \
+  ../include/inn/history.h ../include/inn/defines.h \
   ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/libinn.h ../include/inn/dbz.h ../include/inn/libinn.h \
-  ../include/inn/innconf.h ../include/inn/timer.h ../include/inn/qio.h \
-  ../include/inn/sequence.h ../include/inn/inndcomm.h
+  ../include/inn/libinn.h ../include/inn/dbz.h ../include/inn/innconf.h \
+  ../include/inn/timer.h ../include/inn/qio.h ../include/inn/sequence.h \
+  ../include/inn/inndcomm.h

Modified: innd/Makefile
===================================================================
--- innd/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ innd/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -81,195 +81,176 @@
   ../include/inn/md5.h ../include/inn/ov.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/history.h \
   ../include/inn/storage.h ../include/inn/vector.h ../include/inn/wire.h \
-  innd.h ../include/portable/time.h ../include/config.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
-  ../include/inn/history.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h
+  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/messages.h ../include/inn/timer.h \
+  ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h
 cc.o: cc.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/qio.h innd.h ../include/portable/time.h \
-  ../include/config.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/buffer.h ../include/inn/history.h \
-  ../include/inn/messages.h ../include/inn/timer.h \
-  ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
+  ../include/inn/history.h ../include/inn/messages.h \
+  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/inndcomm.h ../include/innperl.h
 chan.o: chan.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/network.h innd.h ../include/portable/time.h \
-  ../include/config.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/buffer.h ../include/inn/history.h \
-  ../include/inn/messages.h ../include/inn/timer.h \
-  ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/options.h
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
+  ../include/inn/history.h ../include/inn/messages.h \
+  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
 icd.o: icd.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/mmap.h ../include/config.h \
-  ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/mmap.h \
-  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/config.h ../include/portable/mmap.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/mmap.h innd.h \
+  ../include/portable/time.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/inn/buffer.h ../include/inn/history.h \
-  ../include/inn/messages.h ../include/inn/timer.h \
-  ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/options.h ../include/inn/ov.h \
-  ../include/inn/storage.h ../include/inn/history.h
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h
 innd.o: innd.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/newsuser.h ../include/config.h \
-  ../include/clibrary.h ../include/innperl.h innd.h \
-  ../include/portable/time.h ../include/config.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
-  ../include/inn/history.h ../include/inn/timer.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/history.h
+  ../include/inn/messages.h ../include/inn/newsuser.h ../include/innperl.h \
+  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/history.h ../include/inn/timer.h \
+  ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h ../include/inn/ov.h \
+  ../include/inn/storage.h
 keywords.o: keywords.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/innconf.h innd.h ../include/portable/time.h \
-  ../include/config.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/buffer.h ../include/inn/history.h \
-  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h
-lc.o: lc.c ../include/config.h ../include/inn/defines.h \
-  ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  innd.h ../include/portable/time.h ../include/config.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/inn/buffer.h \
   ../include/inn/history.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
+  ../include/inn/timer.h ../include/inn/nntp.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h
+lc.o: lc.c ../include/config.h ../include/inn/defines.h \
+  ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
+  ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
+  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
   ../include/inn/options.h
 nc.o: nc.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/qio.h ../include/inn/version.h innd.h \
-  ../include/portable/time.h ../include/config.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
-  ../include/inn/history.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
+  ../include/portable/time.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
   ../include/inn/options.h
 newsfeeds.o: newsfeeds.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  innd.h ../include/portable/time.h ../include/config.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
-  ../include/inn/history.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
+  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
   ../include/inn/options.h
 ng.o: ng.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  innd.h ../include/portable/time.h ../include/config.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
-  ../include/inn/history.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/history.h
+  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h
 perl.o: perl.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/wire.h ../include/inn/defines.h \
-  innd.h ../include/portable/time.h ../include/config.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
-  ../include/inn/history.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
+  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
   ../include/inn/options.h \
-  ../include/ppport.h ../include/innperl.h
+  ../include/ppport.h \
+  ../include/innperl.h
 proc.o: proc.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/wait.h ../include/config.h \
-  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/config.h ../include/portable/wait.h innd.h \
+  ../include/portable/time.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/inn/buffer.h ../include/inn/defines.h \
   ../include/inn/history.h ../include/inn/messages.h \
   ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
 python.o: python.c ../include/config.h ../include/inn/defines.h \
-  ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/wire.h innd.h ../include/portable/time.h \
-  ../include/config.h ../include/portable/socket.h \
+  ../include/inn/system.h ../include/inn/options.h \
+  ../include/clibrary.h ../include/config.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/wire.h innd.h \
+  ../include/portable/time.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/inn/buffer.h ../include/inn/history.h \
-  ../include/inn/messages.h ../include/inn/timer.h \
-  ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/options.h
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+  ../include/inn/options.h
 rc.o: rc.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/network.h ../include/inn/vector.h innd.h \
   ../include/portable/time.h ../include/inn/buffer.h \
   ../include/inn/history.h ../include/inn/messages.h \
   ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
 site.o: site.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  innd.h ../include/portable/time.h ../include/config.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
-  ../include/inn/history.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
+  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
   ../include/inn/options.h
 status.o: status.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/inn/network.h ../include/inn/defines.h \
   ../include/inn/innconf.h ../include/inn/version.h innd.h \
   ../include/portable/time.h ../include/inn/buffer.h \
   ../include/inn/history.h ../include/inn/messages.h \
   ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/innperl.h
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/innperl.h
 util.o: util.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/libinn.h innd.h ../include/portable/time.h \
-  ../include/config.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/buffer.h ../include/inn/history.h \
-  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h
-wip.o: wip.c ../include/config.h ../include/inn/defines.h \
-  ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  innd.h ../include/portable/time.h ../include/config.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/inn/buffer.h \
   ../include/inn/history.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
+  ../include/inn/timer.h ../include/inn/nntp.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h
+wip.o: wip.c ../include/config.h ../include/inn/defines.h \
+  ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
+  ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
+  innd.h ../include/portable/time.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
   ../include/inn/options.h
 tinyleaf.o: tinyleaf.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/wait.h ../include/config.h \
-  ../include/inn/dispatch.h ../include/inn/messages.h \
-  ../include/inn/defines.h ../include/inn/md5.h ../include/inn/nntp.h \
-  ../include/inn/utility.h ../include/inn/vector.h \
+  ../include/config.h ../include/portable/wait.h ../include/inn/dispatch.h \
+  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/md5.h \
+  ../include/inn/nntp.h ../include/inn/utility.h ../include/inn/vector.h \
   ../include/inn/version.h ../include/inn/libinn.h

Modified: innfeed/Makefile
===================================================================
--- innfeed/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ innfeed/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -103,19 +103,18 @@
 article.o: article.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/mmap.h ../include/config.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/storage.h ../include/inn/options.h article.h misc.h \
-  buffer.h endpoint.h
+  ../include/config.h ../include/portable/mmap.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/storage.h \
+  ../include/inn/options.h article.h misc.h buffer.h endpoint.h
 buffer.o: buffer.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/messages.h ../include/inn/libinn.h \
   buffer.h misc.h
 config_l.o: config_l.c innfeed.h ../include/inn/timer.h \
-  ../include/inn/defines.h ../include/inn/system.h \
-  ../include/inn/libinn.h configfile.h config_y.h misc.h \
-  ../include/config.h ../include/inn/defines.h ../include/inn/options.h
+  ../include/inn/defines.h ../include/inn/system.h ../include/inn/libinn.h \
+  configfile.h config_y.h misc.h ../include/config.h \
+  ../include/inn/defines.h ../include/inn/options.h
 config_y.o: config_y.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
@@ -124,7 +123,7 @@
 connection.o: connection.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/portable/time.h ../include/inn/innconf.h \
   ../include/inn/messages.h ../include/inn/network.h \
@@ -133,7 +132,7 @@
 endpoint.o: endpoint.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/portable/time.h ../include/inn/innconf.h \
   ../include/inn/messages.h ../include/inn/libinn.h buffer.h misc.h \
@@ -141,20 +140,20 @@
 host.o: host.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/config.h ../include/inn/defines.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/innconf.h ../include/inn/messages.h \
-  ../include/inn/network.h ../include/inn/version.h \
-  ../include/inn/libinn.h article.h misc.h buffer.h configfile.h \
-  connection.h endpoint.h host.h innlistener.h tape.h
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/network.h \
+  ../include/inn/version.h ../include/inn/libinn.h article.h misc.h \
+  buffer.h configfile.h connection.h endpoint.h host.h innlistener.h \
+  tape.h
 imap_connection.o: imap_connection.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/messages.h ../include/inn/defines.h \
-  ../include/inn/libinn.h buffer.h misc.h connection.h endpoint.h host.h \
-  innfeed.h ../include/inn/timer.h article.h configfile.h
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/messages.h \
+  ../include/inn/defines.h ../include/inn/libinn.h buffer.h misc.h \
+  connection.h endpoint.h host.h innfeed.h ../include/inn/timer.h \
+  article.h configfile.h
 innlistener.o: innlistener.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
@@ -164,13 +163,13 @@
 main.o: main.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/config.h ../include/inn/defines.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/innconf.h \
-  ../include/inn/messages.h ../include/inn/version.h \
-  ../include/inn/libinn.h ../include/inn/storage.h \
-  ../include/inn/options.h article.h misc.h buffer.h configfile.h \
-  connection.h endpoint.h host.h innlistener.h tape.h
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/time.h \
+  ../include/inn/innconf.h ../include/inn/messages.h \
+  ../include/inn/version.h ../include/inn/libinn.h \
+  ../include/inn/storage.h ../include/inn/options.h article.h misc.h \
+  buffer.h configfile.h connection.h endpoint.h host.h innlistener.h \
+  tape.h
 misc.o: misc.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/config.h ../include/inn/defines.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \

Modified: lib/Makefile
===================================================================
--- lib/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ lib/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -112,12 +112,12 @@
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h
 concat.o: concat.c ../include/config.h ../include/inn/defines.h \
-  ../include/inn/system.h ../include/inn/options.h \
-  ../include/inn/libinn.h ../include/inn/defines.h
+  ../include/inn/system.h ../include/inn/options.h ../include/inn/libinn.h \
+  ../include/inn/defines.h
 conffile.o: conffile.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/conffile.h ../include/inn/libinn.h \
-  ../include/inn/defines.h
+  ../include/config.h ../include/conffile.h ../include/inn/defines.h \
+  ../include/inn/libinn.h
 confparse.o: confparse.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/confparse.h ../include/inn/defines.h \
@@ -132,18 +132,17 @@
   ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h
 dbz.o: dbz.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/mmap.h ../include/config.h \
-  ../include/inn/dbz.h ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/innconf.h \
-  ../include/inn/mmap.h ../include/inn/libinn.h
+  ../include/config.h ../include/portable/mmap.h ../include/inn/dbz.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/innconf.h ../include/inn/mmap.h
 defdist.o: defdist.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/libinn.h ../include/inn/paths.h
 dispatch.o: dispatch.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/inn/dispatch.h ../include/inn/vector.h \
-  ../include/inn/defines.h
+  ../include/config.h ../include/inn/dispatch.h ../include/inn/defines.h \
+  ../include/inn/vector.h
 fdflags.o: fdflags.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h
@@ -179,7 +178,7 @@
   ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/paths.h
 inndcomm.o: inndcomm.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/time.h ../include/config.h \
+  ../include/config.h ../include/portable/time.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/inndcomm.h \
@@ -210,12 +209,11 @@
   ../include/inn/libinn.h
 mmap.o: mmap.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/mmap.h ../include/config.h \
-  ../include/inn/messages.h ../include/inn/defines.h \
-  ../include/inn/mmap.h
+  ../include/config.h ../include/portable/mmap.h ../include/inn/messages.h \
+  ../include/inn/defines.h ../include/inn/mmap.h
 network.o: network.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/portable/time.h ../include/portable/wait.h \
   ../include/inn/innconf.h ../include/inn/defines.h \
@@ -224,11 +222,10 @@
 newsuser.o: newsuser.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/newsuser.h ../include/config.h \
-  ../include/clibrary.h
+  ../include/inn/messages.h ../include/inn/newsuser.h
 nntp.o: nntp.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/portable/time.h ../include/inn/buffer.h \
   ../include/inn/defines.h ../include/inn/innconf.h \
@@ -249,7 +246,7 @@
   ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h
 remopen.o: remopen.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/libinn.h ../include/inn/network.h ../include/inn/nntp.h
@@ -272,9 +269,8 @@
   ../include/config.h ../include/inn/sequence.h ../include/inn/defines.h
 timer.o: timer.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/time.h ../include/config.h \
-  ../include/inn/messages.h ../include/inn/defines.h \
-  ../include/inn/timer.h ../include/inn/libinn.h
+  ../include/config.h ../include/portable/time.h ../include/inn/messages.h \
+  ../include/inn/defines.h ../include/inn/timer.h ../include/inn/libinn.h
 tst.o: tst.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/tst.h ../include/inn/defines.h \
@@ -298,8 +294,8 @@
   ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
   ../include/inn/libinn.h
 xsignal.o: xsignal.c ../include/config.h ../include/inn/defines.h \
-  ../include/inn/system.h ../include/inn/options.h \
-  ../include/inn/libinn.h ../include/inn/defines.h
+  ../include/inn/system.h ../include/inn/options.h ../include/inn/libinn.h \
+  ../include/inn/defines.h
 xwrite.o: xwrite.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h
@@ -316,11 +312,11 @@
   ../include/config.h
 getaddrinfo.o: getaddrinfo.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
 getnameinfo.o: getnameinfo.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
 getpagesize.o: getpagesize.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h
@@ -335,12 +331,13 @@
   ../include/config.h
 inet_ntop.o: inet_ntop.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h
+  ../include/config.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
 memcmp.o: memcmp.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h
 mkstemp.o: mkstemp.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/time.h ../include/config.h
+  ../include/config.h ../include/portable/time.h
 pread.o: pread.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h
@@ -356,8 +353,8 @@
 setproctitle.o: setproctitle.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/setproctitle.h ../include/config.h \
-  ../include/inn/messages.h ../include/inn/defines.h
+  ../include/portable/setproctitle.h ../include/inn/messages.h \
+  ../include/inn/defines.h
 snprintf.o: snprintf.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h
 strcasecmp.o: strcasecmp.c ../include/config.h ../include/inn/defines.h \
@@ -380,5 +377,4 @@
 perl.o: perl.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/ppport.h \
-  ../include/innperl.h
+  ../include/ppport.h ../include/innperl.h

Modified: nnrpd/Makefile
===================================================================
--- nnrpd/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ nnrpd/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -79,22 +79,20 @@
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/messages.h ../include/inn/wire.h nnrpd.h \
-  ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
-  tls.h cache.h
-auth-ext.o: auth-ext.c ../include/config.h ../include/inn/defines.h \
-  ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/wait.h ../include/config.h \
-  ../include/inn/buffer.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/vector.h nnrpd.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/portable/time.h \
   ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h tls.h cache.h
+auth-ext.o: auth-ext.c ../include/config.h ../include/inn/defines.h \
+  ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
+  ../include/config.h ../include/portable/wait.h ../include/inn/buffer.h \
+  ../include/inn/defines.h ../include/inn/messages.h \
+  ../include/inn/vector.h nnrpd.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/timer.h
 cache.o: cache.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -104,16 +102,16 @@
 group.o: group.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  nnrpd.h ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h
+  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/time.h \
+  ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h
 commands.o: commands.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/wait.h ../include/config.h \
-  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/config.h ../include/portable/wait.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/portable/time.h \
   ../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
   ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
@@ -124,53 +122,49 @@
 line.o: line.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
-  nnrpd.h ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  tls.h
+  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/time.h \
+  ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h tls.h
 list.o: list.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h nnrpd.h ../include/portable/socket.h \
-  ../include/config.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/portable/time.h \
-  ../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/portable/time.h ../include/inn/qio.h ../include/inn/defines.h \
+  ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h \
   ../include/inn/innconf.h ../include/inn/messages.h
 misc.o: misc.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  nnrpd.h ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  tls.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/history.h
+  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/time.h \
+  ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h tls.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h
 newnews.o: newnews.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/messages.h ../include/inn/wire.h nnrpd.h \
-  ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
-  cache.h
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/time.h \
+  ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h cache.h
 nnrpd.o: nnrpd.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h \
-  ../include/portable/alloca.h ../include/config.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/setproctitle.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/portable/wait.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/messages.h \
-  ../include/inn/network.h ../include/inn/newsuser.h ../include/config.h \
-  ../include/clibrary.h ../include/inn/ov.h ../include/inn/storage.h \
+  ../include/portable/alloca.h ../include/clibrary.h ../include/config.h \
+  ../include/portable/setproctitle.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/portable/wait.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/messages.h ../include/inn/network.h \
+  ../include/inn/newsuser.h ../include/inn/ov.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/history.h \
   ../include/inn/version.h nnrpd.h ../include/portable/time.h \
   ../include/inn/qio.h ../include/inn/nntp.h ../include/inn/paths.h \
@@ -179,38 +173,35 @@
 perl.o: perl.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  nnrpd.h ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  post.h \
-  ../include/ppport.h \
-  ../include/innperl.h
+  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/time.h \
+  ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h post.h \
+  ../include/ppport.h ../include/innperl.h
 perm.o: perm.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/wait.h ../include/config.h \
-  ../include/conffile.h ../include/inn/network.h ../include/inn/defines.h \
+  ../include/config.h ../include/portable/wait.h ../include/conffile.h \
+  ../include/inn/defines.h ../include/inn/network.h \
   ../include/inn/innconf.h ../include/innperl.h nnrpd.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/portable/time.h \
   ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h
 post.o: post.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  nnrpd.h ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
-  post.h
+  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/time.h \
+  ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h post.h
 python.o: python.c ../include/config.h ../include/inn/defines.h \
-  ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  nnrpd.h ../include/portable/socket.h ../include/config.h \
+  ../include/inn/system.h ../include/inn/options.h \
+  ../include/clibrary.h ../include/config.h ../include/inn/innconf.h \
+  ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
   ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
@@ -219,26 +210,26 @@
 sasl.o: sasl.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
-  nnrpd.h ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h
+  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/time.h \
+  ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h
 tls.o: tls.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h nnrpd.h ../include/portable/socket.h \
-  ../include/config.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/portable/time.h \
-  ../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  ../include/inn/innconf.h tls.h
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/portable/time.h ../include/inn/qio.h ../include/inn/defines.h \
+  ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h ../include/inn/innconf.h \
+  tls.h
 track.o: track.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
-  nnrpd.h ../include/portable/socket.h ../include/config.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h
+  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/time.h \
+  ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/vector.h ../include/inn/timer.h

Modified: storage/Makefile
===================================================================
--- storage/Makefile	2015-01-07 21:03:00 UTC (rev 9780)
+++ storage/Makefile	2015-01-07 21:04:11 UTC (rev 9781)
@@ -104,38 +104,33 @@
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/libinn.h ../include/inn/ov.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/history.h ovinterface.h \
-  ../include/inn/history.h ../include/inn/storage.h \
-  ../include/inn/paths.h ../include/inn/vector.h
+  ../include/inn/storage.h ../include/inn/paths.h ../include/inn/vector.h
 interface.o: interface.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/conffile.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/wire.h interface.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/libinn.h methods.h \
-  ../include/inn/paths.h
+  ../include/config.h ../include/conffile.h ../include/inn/defines.h \
+  ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/wire.h \
+  interface.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/libinn.h methods.h ../include/inn/paths.h
 methods.o: methods.c interface.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/inn/storage.h \
   ../include/inn/defines.h ../include/inn/options.h methods.h cnfs/cnfs.h \
-  timecaf/timecaf.h ../include/config.h interface.h timehash/timehash.h \
-  ../include/config.h interface.h tradspool/tradspool.h \
-  ../include/config.h interface.h trash/trash.h ../include/config.h \
-  interface.h
+  timecaf/timecaf.h interface.h timehash/timehash.h tradspool/tradspool.h \
+  trash/trash.h
 ov.o: ov.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/messages.h ../include/inn/wire.h ../include/inn/vector.h \
   ../include/inn/libinn.h ../include/inn/ov.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/history.h ovinterface.h \
-  ../include/inn/history.h ../include/inn/storage.h ovmethods.h
+  ../include/inn/storage.h ovmethods.h
 overdata.o: overdata.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/buffer.h ../include/inn/defines.h \
-  ../include/inn/innconf.h ../include/inn/messages.h \
-  ../include/inn/wire.h ../include/inn/vector.h ../include/inn/libinn.h \
-  ovinterface.h ../include/inn/history.h ../include/inn/ov.h \
-  ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/history.h ../include/inn/storage.h
+  ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/wire.h \
+  ../include/inn/vector.h ../include/inn/libinn.h ovinterface.h \
+  ../include/inn/history.h ../include/inn/ov.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/storage.h
 overview.o: overview.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/buffer.h ../include/inn/defines.h \
@@ -143,51 +138,44 @@
   ../include/inn/overview.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/wire.h ../include/inn/vector.h \
   ../include/inn/libinn.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/history.h ovinterface.h ../include/inn/history.h \
-  ../include/inn/storage.h ovmethods.h
+  ../include/inn/history.h ovinterface.h ovmethods.h
 ovmethods.o: ovmethods.c ovinterface.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/inn/history.h \
   ../include/inn/defines.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/history.h \
-  ../include/inn/storage.h buffindexed/buffindexed.h ovdb/ovdb.h \
-  tradindexed/tradindexed.h ../include/config.h ../include/inn/ov.h \
-  ../include/inn/storage.h
+  ../include/inn/options.h ../include/inn/storage.h \
+  buffindexed/buffindexed.h ovdb/ovdb.h tradindexed/tradindexed.h
 buffindexed/buffindexed.o: buffindexed/buffindexed.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/mmap.h ../include/config.h ../include/inn/innconf.h \
+  ../include/portable/mmap.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/messages.h \
   ../include/inn/libinn.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/history.h \
-  ../include/inn/paths.h ovinterface.h ../include/config.h \
-  ../include/inn/history.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/storage.h buffindexed/shmem.h buffindexed/buffindexed.h
+  ../include/inn/options.h ../include/inn/history.h ../include/inn/paths.h \
+  ovinterface.h ../include/inn/storage.h buffindexed/shmem.h \
+  buffindexed/buffindexed.h
 buffindexed/shmem.o: buffindexed/shmem.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
   ../include/inn/libinn.h buffindexed/shmem.h
 cnfs/cnfs.o: cnfs/cnfs.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/mmap.h ../include/config.h \
+  ../include/config.h ../include/portable/mmap.h \
   ../include/portable/time.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/mmap.h ../include/inn/wire.h interface.h \
-  ../include/config.h ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/libinn.h methods.h interface.h ../include/inn/paths.h \
-  cnfs/cnfs.h cnfs/cnfs-private.h
+  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/mmap.h \
+  ../include/inn/wire.h interface.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/libinn.h methods.h interface.h \
+  ../include/inn/paths.h cnfs/cnfs.h cnfs/cnfs-private.h
 ovdb/ovdb.o: ovdb/ovdb.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/socket.h ../include/config.h \
+  ../include/config.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
   ../include/portable/time.h ../include/conffile.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/defines.h ../include/inn/innconf.h \
   ../include/inn/libinn.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
-  ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/history.h ovinterface.h ../include/config.h \
-  ../include/inn/history.h ../include/inn/ov.h ../include/inn/storage.h \
+  ../include/inn/newsuser.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h ovinterface.h \
   ovdb/ovdb.h ovdb/ovdb-private.h
 timecaf/caf.o: timecaf/caf.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -195,20 +183,19 @@
   ../include/inn/libinn.h timecaf/caf.h
 timecaf/timecaf.o: timecaf/timecaf.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
-  ../include/config.h ../include/portable/mmap.h ../include/config.h \
-  timecaf/caf.h ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/config.h ../include/portable/mmap.h timecaf/caf.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
   ../include/inn/messages.h ../include/inn/wire.h ../include/inn/libinn.h \
-  methods.h interface.h ../include/config.h ../include/inn/storage.h \
-  ../include/inn/options.h timecaf/timecaf.h interface.h \
-  ../include/inn/paths.h
+  methods.h interface.h ../include/inn/storage.h ../include/inn/options.h \
+  timecaf/timecaf.h interface.h ../include/inn/paths.h
 timehash/timehash.o: timehash/timehash.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/mmap.h ../include/config.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/wire.h ../include/inn/libinn.h methods.h interface.h \
-  ../include/config.h ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/paths.h timehash/timehash.h interface.h
+  ../include/portable/mmap.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
+  ../include/inn/libinn.h methods.h interface.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/paths.h timehash/timehash.h \
+  interface.h
 tradindexed/tdx-cache.o: tradindexed/tdx-cache.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
@@ -219,18 +206,16 @@
 tradindexed/tdx-data.o: tradindexed/tdx-data.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/mmap.h ../include/config.h ../include/inn/history.h \
+  ../include/portable/mmap.h ../include/inn/history.h \
   ../include/inn/defines.h ../include/inn/innconf.h \
   ../include/inn/messages.h ../include/inn/mmap.h ../include/inn/libinn.h \
   ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/history.h ovinterface.h ../include/config.h \
-  ../include/inn/history.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/storage.h tradindexed/tdx-private.h \
+  ovinterface.h ../include/inn/storage.h tradindexed/tdx-private.h \
   tradindexed/tdx-structure.h
 tradindexed/tdx-group.o: tradindexed/tdx-group.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/mmap.h ../include/config.h ../include/inn/hashtab.h \
+  ../include/portable/mmap.h ../include/inn/hashtab.h \
   ../include/inn/defines.h ../include/inn/innconf.h \
   ../include/inn/messages.h ../include/inn/mmap.h ../include/inn/qio.h \
   ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/paths.h \
@@ -248,26 +233,23 @@
 tradspool/tradspool.o: tradspool/tradspool.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/portable/mmap.h ../include/config.h ../include/inn/innconf.h \
+  ../include/portable/mmap.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
   ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/paths.h \
-  methods.h interface.h ../include/config.h ../include/inn/storage.h \
-  ../include/inn/options.h tradspool/tradspool.h interface.h
+  methods.h interface.h ../include/inn/storage.h ../include/inn/options.h \
+  tradspool/tradspool.h interface.h
 trash/trash.o: trash/trash.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
-  methods.h interface.h ../include/config.h ../include/inn/storage.h \
-  ../include/inn/options.h trash/trash.h interface.h
+  methods.h interface.h ../include/inn/storage.h ../include/inn/options.h \
+  trash/trash.h interface.h
 tradindexed/tdx-util.o: tradindexed/tdx-util.c ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/inn/buffer.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/history.h \
-  ../include/inn/innconf.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/history.h ../include/inn/paths.h ../include/inn/vector.h \
-  ../include/inn/wire.h ovinterface.h ../include/config.h \
-  ../include/inn/history.h ../include/inn/ov.h ../include/inn/storage.h \
-  tradindexed/tdx-private.h ../include/inn/storage.h \
+  ../include/inn/buffer.h ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/history.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/newsuser.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/options.h ../include/inn/paths.h \
+  ../include/inn/vector.h ../include/inn/wire.h ovinterface.h \
+  ../include/inn/storage.h tradindexed/tdx-private.h \
   tradindexed/tdx-structure.h

Modified: support/makedepend
===================================================================
--- support/makedepend	2015-01-07 21:03:00 UTC (rev 9780)
+++ support/makedepend	2015-01-07 21:04:11 UTC (rev 9781)
@@ -23,14 +23,14 @@
         base=`echo "$source" | sed 's/\..*//'`
         gcc -MM $flags "$source" | sed "s%^[^.: ][^.: ]*%$base%" \
             | sed -e 's%\(^\|  *\)/[^ ]* *%\1%g' -e '/^ *\\$/d' \
-                  -e 's/  *\(  \| \\\)/\1/g' \
+                  -e 's/  *\(  \| \\\)/\1/g' -e 's/^ \([^ ]\)/  \1/g' \
             | sed -e '/ \\$/N; s/ \\\n *$//g; P; D' \
             >> .makefile.tmp
         ;;
     *)
         gcc -MM $flags "$source" \
             | sed -e 's%\(^\|  *\)/[^ ]*%\1%g' -e '/^ *\\$/d' \
-                  -e 's/  *\(  \| \\\)/\1/g' \
+                  -e 's/  *\(  \| \\\)/\1/g' -e 's/^ \([^ ]\)/  \1/g' \
             | sed -e '/ \\$/N; s/ \\\n *$//g; P; D' \
             >> .makefile.tmp
         ;;



More information about the inn-committers mailing list