[ntpsec commit] Lift the ISC library a directory level so it is uniform with the others.

Tue Oct 20 20:38:01 UTC 2015

Module:    ntpsec
Branch:    master
Commit:    fa66a9945309d01d3064ff0c4fe8f45249843406
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=fa66a9945309d01d3064ff0c4fe8f45249843406

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Tue Oct 20 16:36:32 2015 -0400

Lift the ISC library a directory level so it is uniform with the others.

It is now libisc/. The Unix and Windows implementation code is still a level
deeper, though.

---

 README                                                | 6 ++----
 include/isc/mem.h                                     | 6 +++---
 {lib/isc => libisc}/api                               | 0
 {lib/isc => libisc}/assertions.c                      | 0
 {lib/isc => libisc}/backtrace-emptytbl.c              | 0
 {lib/isc => libisc}/backtrace.c                       | 0
 {lib/isc => libisc}/error.c                           | 0
 {lib/isc => libisc}/include/isc/assertions.h          | 0
 {lib/isc => libisc}/include/isc/backtrace.h           | 0
 {lib/isc => libisc}/include/isc/error.h               | 0
 {lib/isc => libisc}/include/isc/formatcheck.h         | 0
 {lib/isc => libisc}/include/isc/interfaceiter.h       | 0
 {lib/isc => libisc}/include/isc/lang.h                | 0
 {lib/isc => libisc}/include/isc/list.h                | 0
 {lib/isc => libisc}/include/isc/log.h                 | 0
 {lib/isc => libisc}/include/isc/magic.h               | 0
 {lib/isc => libisc}/include/isc/md5.h                 | 0
 {lib/isc => libisc}/include/isc/netaddr.h             | 0
 {lib/isc => libisc}/include/isc/once.h                | 0
 {lib/isc => libisc}/include/isc/platform.h            | 0
 {lib/isc => libisc}/include/isc/platform.h.in         | 0
 {lib/isc => libisc}/include/isc/random.h              | 0
 {lib/isc => libisc}/include/isc/result.h              | 0
 {lib/isc => libisc}/include/isc/resultclass.h         | 0
 {lib/isc => libisc}/include/isc/sha1.h                | 0
 {lib/isc => libisc}/include/isc/sockaddr.h            | 0
 {lib/isc => libisc}/include/isc/types.h               | 0
 {lib/isc => libisc}/include/isc/util.h                | 0
 {lib/isc => libisc}/inet_aton.c                       | 0
 {lib/isc => libisc}/log.c                             | 0
 {lib/isc => libisc}/md5.c                             | 0
 {lib/isc => libisc}/netaddr.c                         | 0
 {lib/isc => libisc}/random.c                          | 0
 {lib/isc => libisc}/result.c                          | 0
 {lib/isc => libisc}/sha1.c                            | 0
 {lib/isc => libisc}/unix/errno2result.c               | 0
 {lib/isc => libisc}/unix/errno2result.h               | 0
 {lib/isc => libisc}/unix/ifiter_getifaddrs.c          | 0
 {lib/isc => libisc}/unix/ifiter_ioctl.c               | 0
 {lib/isc => libisc}/unix/ifiter_sysctl.c              | 0
 {lib/isc => libisc}/unix/include/isc/int.h            | 0
 {lib/isc => libisc}/unix/include/isc/net.h            | 0
 {lib/isc => libisc}/unix/include/isc/netdb.h          | 0
 {lib/isc => libisc}/unix/include/isc/syslog.h         | 0
 {lib/isc => libisc}/unix/include/isc/time.h           | 0
 {lib/isc => libisc}/unix/interfaceiter.c              | 0
 {lib/isc => libisc}/unix/net.c                        | 0
 {lib/isc => libisc}/unix/time.c                       | 0
 {lib/isc => libisc}/win32/DLLMain.c                   | 0
 {lib/isc => libisc}/win32/errno2result.c              | 0
 {lib/isc => libisc}/win32/errno2result.h              | 2 +-
 {lib/isc => libisc}/win32/include/isc/bind_registry.h | 0
 {lib/isc => libisc}/win32/include/isc/bindevt.h       | 0
 {lib/isc => libisc}/win32/include/isc/int.h           | 0
 {lib/isc => libisc}/win32/include/isc/ipv6.h          | 0
 {lib/isc => libisc}/win32/include/isc/net.h           | 0
 {lib/isc => libisc}/win32/include/isc/netdb.h         | 0
 {lib/isc => libisc}/win32/include/isc/ntgroups.h      | 0
 {lib/isc => libisc}/win32/include/isc/ntpaths.h       | 0
 {lib/isc => libisc}/win32/include/isc/offset.h        | 0
 {lib/isc => libisc}/win32/include/isc/once.h          | 0
 {lib/isc => libisc}/win32/include/isc/platform.h      | 0
 {lib/isc => libisc}/win32/include/isc/syslog.h        | 0
 {lib/isc => libisc}/win32/include/isc/time.h          | 0
 {lib/isc => libisc}/win32/include/isc/win32os.h       | 0
 {lib/isc => libisc}/win32/interfaceiter.c             | 0
 {lib/isc => libisc}/win32/libisc.def                  | 0
 {lib/isc => libisc}/win32/libisc.dsp                  | 0
 {lib/isc => libisc}/win32/libisc.dsw                  | 0
 {lib/isc => libisc}/win32/libisc.mak                  | 4 ++--
 {lib/isc => libisc}/win32/net.c                       | 0
 {lib/isc => libisc}/win32/netdb.h                     | 0
 {lib/isc => libisc}/win32/ntgroups.c                  | 0
 {lib/isc => libisc}/win32/ntpaths.c                   | 0
 {lib/isc => libisc}/win32/once.c                      | 0
 {lib/isc => libisc}/win32/syslog.h                    | 0
 {lib/isc => libisc}/win32/time.c                      | 0
 {lib/isc => libisc}/win32/win32os.c                   | 0
 {lib/isc => libisc}/wscript                           | 6 +++---
 libntp/wscript                                        | 4 ++--
 pylib/configure.py                                    | 2 +-
 pylib/waf.py                                          | 4 ++--
 wscript                                               | 2 +-
 83 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/README b/README
index 52c0856..47254f5 100644
--- a/README
+++ b/README
@@ -38,10 +38,8 @@ include/::	Directory containing include header files used by most
 
 INSTALL::	Installation instructions.
 
-lib/::		Source code for third-party libraries included in the
-		distribution.  Currently just one: isc, utility code
-		from Internet Systems Consortium.  The local copy has
-		been significantly modified.
+libisc/::	Utility code from Internet Systems Consortium.  The local
+		copy has been significantly trimmed and modified.
 
 libjsmn/::	A minimal JSON library used by the GPSD-JSON driver.
 
diff --git a/include/isc/mem.h b/include/isc/mem.h
index 2857594..1500d1a 100644
--- a/include/isc/mem.h
+++ b/include/isc/mem.h
@@ -1,12 +1,12 @@
 /*
  * libntp local override of isc/mem.h to stub it out.
  *
- * include/isc is searched before any of the lib/isc include
+ * include/isc is searched before any of the libisc include
  * directories and should be used only for replacement NTP headers
- * overriding headers of the same name under lib/isc.
+ * overriding headers of the same name under libisc.
  *
  * NOTE: this assumes the system malloc is thread-safe and does
- *	 not use any normal lib/isc locking.
+ *	 not use any normal libisc locking.
  *
  * Copyright 2015 by the NTPsec project contributors
  * SPDX-License-Identifier: ISC
diff --git a/lib/isc/api b/libisc/api
similarity index 100%
rename from lib/isc/api
rename to libisc/api
diff --git a/lib/isc/assertions.c b/libisc/assertions.c
similarity index 100%
rename from lib/isc/assertions.c
rename to libisc/assertions.c
diff --git a/lib/isc/backtrace-emptytbl.c b/libisc/backtrace-emptytbl.c
similarity index 100%
rename from lib/isc/backtrace-emptytbl.c
rename to libisc/backtrace-emptytbl.c
diff --git a/lib/isc/backtrace.c b/libisc/backtrace.c
similarity index 100%
rename from lib/isc/backtrace.c
rename to libisc/backtrace.c
diff --git a/lib/isc/error.c b/libisc/error.c
similarity index 100%
rename from lib/isc/error.c
rename to libisc/error.c
diff --git a/lib/isc/include/isc/assertions.h b/libisc/include/isc/assertions.h
similarity index 100%
rename from lib/isc/include/isc/assertions.h
rename to libisc/include/isc/assertions.h
diff --git a/lib/isc/include/isc/backtrace.h b/libisc/include/isc/backtrace.h
similarity index 100%
rename from lib/isc/include/isc/backtrace.h
rename to libisc/include/isc/backtrace.h
diff --git a/lib/isc/include/isc/error.h b/libisc/include/isc/error.h
similarity index 100%
rename from lib/isc/include/isc/error.h
rename to libisc/include/isc/error.h
diff --git a/lib/isc/include/isc/formatcheck.h b/libisc/include/isc/formatcheck.h
similarity index 100%
rename from lib/isc/include/isc/formatcheck.h
rename to libisc/include/isc/formatcheck.h
diff --git a/lib/isc/include/isc/interfaceiter.h b/libisc/include/isc/interfaceiter.h
similarity index 100%
rename from lib/isc/include/isc/interfaceiter.h
rename to libisc/include/isc/interfaceiter.h
diff --git a/lib/isc/include/isc/lang.h b/libisc/include/isc/lang.h
similarity index 100%
rename from lib/isc/include/isc/lang.h
rename to libisc/include/isc/lang.h
diff --git a/lib/isc/include/isc/list.h b/libisc/include/isc/list.h
similarity index 100%
rename from lib/isc/include/isc/list.h
rename to libisc/include/isc/list.h
diff --git a/lib/isc/include/isc/log.h b/libisc/include/isc/log.h
similarity index 100%
rename from lib/isc/include/isc/log.h
rename to libisc/include/isc/log.h
diff --git a/lib/isc/include/isc/magic.h b/libisc/include/isc/magic.h
similarity index 100%
rename from lib/isc/include/isc/magic.h
rename to libisc/include/isc/magic.h
diff --git a/lib/isc/include/isc/md5.h b/libisc/include/isc/md5.h
similarity index 100%
rename from lib/isc/include/isc/md5.h
rename to libisc/include/isc/md5.h
diff --git a/lib/isc/include/isc/netaddr.h b/libisc/include/isc/netaddr.h
similarity index 100%
rename from lib/isc/include/isc/netaddr.h
rename to libisc/include/isc/netaddr.h
diff --git a/lib/isc/include/isc/once.h b/libisc/include/isc/once.h
similarity index 100%
rename from lib/isc/include/isc/once.h
rename to libisc/include/isc/once.h
diff --git a/lib/isc/include/isc/platform.h b/libisc/include/isc/platform.h
similarity index 100%
rename from lib/isc/include/isc/platform.h
rename to libisc/include/isc/platform.h
diff --git a/lib/isc/include/isc/platform.h.in b/libisc/include/isc/platform.h.in
similarity index 100%
rename from lib/isc/include/isc/platform.h.in
rename to libisc/include/isc/platform.h.in
diff --git a/lib/isc/include/isc/random.h b/libisc/include/isc/random.h
similarity index 100%
rename from lib/isc/include/isc/random.h
rename to libisc/include/isc/random.h
diff --git a/lib/isc/include/isc/result.h b/libisc/include/isc/result.h
similarity index 100%
rename from lib/isc/include/isc/result.h
rename to libisc/include/isc/result.h
diff --git a/lib/isc/include/isc/resultclass.h b/libisc/include/isc/resultclass.h
similarity index 100%
rename from lib/isc/include/isc/resultclass.h
rename to libisc/include/isc/resultclass.h
diff --git a/lib/isc/include/isc/sha1.h b/libisc/include/isc/sha1.h
similarity index 100%
rename from lib/isc/include/isc/sha1.h
rename to libisc/include/isc/sha1.h
diff --git a/lib/isc/include/isc/sockaddr.h b/libisc/include/isc/sockaddr.h
similarity index 100%
rename from lib/isc/include/isc/sockaddr.h
rename to libisc/include/isc/sockaddr.h
diff --git a/lib/isc/include/isc/types.h b/libisc/include/isc/types.h
similarity index 100%
rename from lib/isc/include/isc/types.h
rename to libisc/include/isc/types.h
diff --git a/lib/isc/include/isc/util.h b/libisc/include/isc/util.h
similarity index 100%
rename from lib/isc/include/isc/util.h
rename to libisc/include/isc/util.h
diff --git a/lib/isc/inet_aton.c b/libisc/inet_aton.c
similarity index 100%
rename from lib/isc/inet_aton.c
rename to libisc/inet_aton.c
diff --git a/lib/isc/log.c b/libisc/log.c
similarity index 100%
rename from lib/isc/log.c
rename to libisc/log.c
diff --git a/lib/isc/md5.c b/libisc/md5.c
similarity index 100%
rename from lib/isc/md5.c
rename to libisc/md5.c
diff --git a/lib/isc/netaddr.c b/libisc/netaddr.c
similarity index 100%
rename from lib/isc/netaddr.c
rename to libisc/netaddr.c
diff --git a/lib/isc/random.c b/libisc/random.c
similarity index 100%
rename from lib/isc/random.c
rename to libisc/random.c
diff --git a/lib/isc/result.c b/libisc/result.c
similarity index 100%
rename from lib/isc/result.c
rename to libisc/result.c
diff --git a/lib/isc/sha1.c b/libisc/sha1.c
similarity index 100%
rename from lib/isc/sha1.c
rename to libisc/sha1.c
diff --git a/lib/isc/unix/errno2result.c b/libisc/unix/errno2result.c
similarity index 100%
rename from lib/isc/unix/errno2result.c
rename to libisc/unix/errno2result.c
diff --git a/lib/isc/unix/errno2result.h b/libisc/unix/errno2result.h
similarity index 100%
rename from lib/isc/unix/errno2result.h
rename to libisc/unix/errno2result.h
diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/libisc/unix/ifiter_getifaddrs.c
similarity index 100%
rename from lib/isc/unix/ifiter_getifaddrs.c
rename to libisc/unix/ifiter_getifaddrs.c
diff --git a/lib/isc/unix/ifiter_ioctl.c b/libisc/unix/ifiter_ioctl.c
similarity index 100%
rename from lib/isc/unix/ifiter_ioctl.c
rename to libisc/unix/ifiter_ioctl.c
diff --git a/lib/isc/unix/ifiter_sysctl.c b/libisc/unix/ifiter_sysctl.c
similarity index 100%
rename from lib/isc/unix/ifiter_sysctl.c
rename to libisc/unix/ifiter_sysctl.c
diff --git a/lib/isc/unix/include/isc/int.h b/libisc/unix/include/isc/int.h
similarity index 100%
rename from lib/isc/unix/include/isc/int.h
rename to libisc/unix/include/isc/int.h
diff --git a/lib/isc/unix/include/isc/net.h b/libisc/unix/include/isc/net.h
similarity index 100%
rename from lib/isc/unix/include/isc/net.h
rename to libisc/unix/include/isc/net.h
diff --git a/lib/isc/unix/include/isc/netdb.h b/libisc/unix/include/isc/netdb.h
similarity index 100%
rename from lib/isc/unix/include/isc/netdb.h
rename to libisc/unix/include/isc/netdb.h
diff --git a/lib/isc/unix/include/isc/syslog.h b/libisc/unix/include/isc/syslog.h
similarity index 100%
rename from lib/isc/unix/include/isc/syslog.h
rename to libisc/unix/include/isc/syslog.h
diff --git a/lib/isc/unix/include/isc/time.h b/libisc/unix/include/isc/time.h
similarity index 100%
rename from lib/isc/unix/include/isc/time.h
rename to libisc/unix/include/isc/time.h
diff --git a/lib/isc/unix/interfaceiter.c b/libisc/unix/interfaceiter.c
similarity index 100%
rename from lib/isc/unix/interfaceiter.c
rename to libisc/unix/interfaceiter.c
diff --git a/lib/isc/unix/net.c b/libisc/unix/net.c
similarity index 100%
rename from lib/isc/unix/net.c
rename to libisc/unix/net.c
diff --git a/lib/isc/unix/time.c b/libisc/unix/time.c
similarity index 100%
rename from lib/isc/unix/time.c
rename to libisc/unix/time.c
diff --git a/lib/isc/win32/DLLMain.c b/libisc/win32/DLLMain.c
similarity index 100%
rename from lib/isc/win32/DLLMain.c
rename to libisc/win32/DLLMain.c
diff --git a/lib/isc/win32/errno2result.c b/libisc/win32/errno2result.c
similarity index 100%
rename from lib/isc/win32/errno2result.c
rename to libisc/win32/errno2result.c
diff --git a/lib/isc/win32/errno2result.h b/libisc/win32/errno2result.h
similarity index 89%
rename from lib/isc/win32/errno2result.h
rename to libisc/win32/errno2result.h
index 0b78e6e..712cdeb 100644
--- a/lib/isc/win32/errno2result.h
+++ b/libisc/win32/errno2result.h
@@ -8,7 +8,7 @@
 #ifndef GUARD_UNIX_ERRNO2RESULT_H
 #define GUARD_UNIX_ERRNO2RESULT_H 1
 
-/* XXXDCL this should be moved to lib/isc/include/isc/errno2result.h. */
+/* XXXDCL this should be moved to libisc/include/isc/errno2result.h. */
 
 #include <errno.h>		/* Provides errno. */
 
diff --git a/lib/isc/win32/include/isc/bind_registry.h b/libisc/win32/include/isc/bind_registry.h
similarity index 100%
rename from lib/isc/win32/include/isc/bind_registry.h
rename to libisc/win32/include/isc/bind_registry.h
diff --git a/lib/isc/win32/include/isc/bindevt.h b/libisc/win32/include/isc/bindevt.h
similarity index 100%
rename from lib/isc/win32/include/isc/bindevt.h
rename to libisc/win32/include/isc/bindevt.h
diff --git a/lib/isc/win32/include/isc/int.h b/libisc/win32/include/isc/int.h
similarity index 100%
rename from lib/isc/win32/include/isc/int.h
rename to libisc/win32/include/isc/int.h
diff --git a/lib/isc/win32/include/isc/ipv6.h b/libisc/win32/include/isc/ipv6.h
similarity index 100%
rename from lib/isc/win32/include/isc/ipv6.h
rename to libisc/win32/include/isc/ipv6.h
diff --git a/lib/isc/win32/include/isc/net.h b/libisc/win32/include/isc/net.h
similarity index 100%
rename from lib/isc/win32/include/isc/net.h
rename to libisc/win32/include/isc/net.h
diff --git a/lib/isc/win32/include/isc/netdb.h b/libisc/win32/include/isc/netdb.h
similarity index 100%
rename from lib/isc/win32/include/isc/netdb.h
rename to libisc/win32/include/isc/netdb.h
diff --git a/lib/isc/win32/include/isc/ntgroups.h b/libisc/win32/include/isc/ntgroups.h
similarity index 100%
rename from lib/isc/win32/include/isc/ntgroups.h
rename to libisc/win32/include/isc/ntgroups.h
diff --git a/lib/isc/win32/include/isc/ntpaths.h b/libisc/win32/include/isc/ntpaths.h
similarity index 100%
rename from lib/isc/win32/include/isc/ntpaths.h
rename to libisc/win32/include/isc/ntpaths.h
diff --git a/lib/isc/win32/include/isc/offset.h b/libisc/win32/include/isc/offset.h
similarity index 100%
rename from lib/isc/win32/include/isc/offset.h
rename to libisc/win32/include/isc/offset.h
diff --git a/lib/isc/win32/include/isc/once.h b/libisc/win32/include/isc/once.h
similarity index 100%
rename from lib/isc/win32/include/isc/once.h
rename to libisc/win32/include/isc/once.h
diff --git a/lib/isc/win32/include/isc/platform.h b/libisc/win32/include/isc/platform.h
similarity index 100%
rename from lib/isc/win32/include/isc/platform.h
rename to libisc/win32/include/isc/platform.h
diff --git a/lib/isc/win32/include/isc/syslog.h b/libisc/win32/include/isc/syslog.h
similarity index 100%
rename from lib/isc/win32/include/isc/syslog.h
rename to libisc/win32/include/isc/syslog.h
diff --git a/lib/isc/win32/include/isc/time.h b/libisc/win32/include/isc/time.h
similarity index 100%
rename from lib/isc/win32/include/isc/time.h
rename to libisc/win32/include/isc/time.h
diff --git a/lib/isc/win32/include/isc/win32os.h b/libisc/win32/include/isc/win32os.h
similarity index 100%
rename from lib/isc/win32/include/isc/win32os.h
rename to libisc/win32/include/isc/win32os.h
diff --git a/lib/isc/win32/interfaceiter.c b/libisc/win32/interfaceiter.c
similarity index 100%
rename from lib/isc/win32/interfaceiter.c
rename to libisc/win32/interfaceiter.c
diff --git a/lib/isc/win32/libisc.def b/libisc/win32/libisc.def
similarity index 100%
rename from lib/isc/win32/libisc.def
rename to libisc/win32/libisc.def
diff --git a/lib/isc/win32/libisc.dsp b/libisc/win32/libisc.dsp
similarity index 100%
rename from lib/isc/win32/libisc.dsp
rename to libisc/win32/libisc.dsp
diff --git a/lib/isc/win32/libisc.dsw b/libisc/win32/libisc.dsw
similarity index 100%
rename from lib/isc/win32/libisc.dsw
rename to libisc/win32/libisc.dsw
diff --git a/lib/isc/win32/libisc.mak b/libisc/win32/libisc.mak
similarity index 98%
rename from lib/isc/win32/libisc.mak
rename to libisc/win32/libisc.mak
index 1a0fa09..0727c83 100644
--- a/lib/isc/win32/libisc.mak
+++ b/libisc/win32/libisc.mak
@@ -198,7 +198,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/noatomic/include" /I "win32" /I "../../isccfg/include" /I "../../../../libxml2-2.7.3/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../libisc/noatomic/include" /I "win32" /I "../../isccfg/include" /I "../../../../libxml2-2.7.3/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" 
@@ -467,7 +467,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/noatomic/include" /I "win32" /I "../../isccfg/include" /I "../../../../libxml2-2.7.3/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../libisc/noatomic/include" /I "win32" /I "../../isccfg/include" /I "../../../../libxml2-2.7.3/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" 
diff --git a/lib/isc/win32/net.c b/libisc/win32/net.c
similarity index 100%
rename from lib/isc/win32/net.c
rename to libisc/win32/net.c
diff --git a/lib/isc/win32/netdb.h b/libisc/win32/netdb.h
similarity index 100%
rename from lib/isc/win32/netdb.h
rename to libisc/win32/netdb.h
diff --git a/lib/isc/win32/ntgroups.c b/libisc/win32/ntgroups.c
similarity index 100%
rename from lib/isc/win32/ntgroups.c
rename to libisc/win32/ntgroups.c
diff --git a/lib/isc/win32/ntpaths.c b/libisc/win32/ntpaths.c
similarity index 100%
rename from lib/isc/win32/ntpaths.c
rename to libisc/win32/ntpaths.c
diff --git a/lib/isc/win32/once.c b/libisc/win32/once.c
similarity index 100%
rename from lib/isc/win32/once.c
rename to libisc/win32/once.c
diff --git a/lib/isc/win32/syslog.h b/libisc/win32/syslog.h
similarity index 100%
rename from lib/isc/win32/syslog.h
rename to libisc/win32/syslog.h
diff --git a/lib/isc/win32/time.c b/libisc/win32/time.c
similarity index 100%
rename from lib/isc/win32/time.c
rename to libisc/win32/time.c
diff --git a/lib/isc/win32/win32os.c b/libisc/win32/win32os.c
similarity index 100%
rename from lib/isc/win32/win32os.c
rename to libisc/win32/win32os.c
diff --git a/lib/isc/wscript b/libisc/wscript
similarity index 66%
rename from lib/isc/wscript
rename to libisc/wscript
index e01eb7f..252a3c9 100644
--- a/lib/isc/wscript
+++ b/libisc/wscript
@@ -23,9 +23,9 @@ def build(ctx):
 		features	= "c bld_include src_include",
 		source		= libisc_source,
 		includes	= [
-						"%s/lib/isc/include/" % ctx.srcnode.abspath(),
-						"%s/lib/isc/unix/include/" % ctx.srcnode.abspath(), # XXX: platform: requires unix/win32 switch.
-						"%s/lib/isc/pthreads/include/" % ctx.srcnode.abspath() # XXX: platform: requires thread switch
+						"%s/libisc/include/" % ctx.srcnode.abspath(),
+						"%s/libisc/unix/include/" % ctx.srcnode.abspath(), # XXX: platform: requires unix/win32 switch.
+						"%s/libisc/pthreads/include/" % ctx.srcnode.abspath() # XXX: platform: requires thread switch
 					],
 
 	)
diff --git a/libntp/wscript b/libntp/wscript
index 2ebfc10..4e78d8a 100644
--- a/libntp/wscript
+++ b/libntp/wscript
@@ -84,8 +84,8 @@ def build(ctx):
 		features	= "c cstlib bld_include src_include",
 		source		= libntp_source + libntp_source_systime,
 		includes	= [
-						"%s/lib/isc/include/" % srcnode,
-						"%s/lib/isc/unix/include/" % srcnode, # XXX: platform: requires unix/win32 switch.
+						"%s/libisc/include/" % srcnode,
+						"%s/libisc/unix/include/" % srcnode, # XXX: platform: requires unix/win32 switch.
 					],
 
 	)
diff --git a/pylib/configure.py b/pylib/configure.py
index 5f2353b..b15c31e 100644
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -433,7 +433,7 @@ def cmd_configure(ctx):
 	ctx.define("DIR_SEP", "'%s'" % sep, quote=False)
 
 
-	# lib/isc/
+	# libisc/
 	# XXX: Hack that needs to be fixed properly for all platforms
 	ctx.define("ISC_PLATFORM_NORETURN_PRE", "", quote=False)
 	ctx.define("ISC_PLATFORM_NORETURN_POST", "__attribute__((__noreturn__))", quote=False)
diff --git a/pylib/waf.py b/pylib/waf.py
index 3c63ca2..fb4b6d9 100644
--- a/pylib/waf.py
+++ b/pylib/waf.py
@@ -20,14 +20,14 @@ def insert_srcdir(self):
 @feature('libisc_include')
 def insert_libiscdir(self):
 	srcnode = self.bld.srcnode.abspath()
-	self.includes += ["%s/lib/isc/include/" % srcnode, "%s/lib/isc/unix/include/" % srcnode] # XXX: Must be fixed for Windows
+	self.includes += ["%s/libisc/include/" % srcnode, "%s/libisc/unix/include/" % srcnode] # XXX: Must be fixed for Windows
 
 
 @before_method('apply_incpaths')
 @feature('libisc_pthread_include')
 def insert_libiscpthreaddir(self):
 	srcnode = self.bld.srcnode.abspath()
-	self.includes += ["%s/lib/isc/pthreads/include/" % srcnode]
+	self.includes += ["%s/libisc/pthreads/include/" % srcnode]
 
 
 # Create version.c
diff --git a/wscript b/wscript
index 2ee9e23..85eb287 100644
--- a/wscript
+++ b/wscript
@@ -94,7 +94,7 @@ def build(ctx):
 		ctx.recurse("docs")
 
 
-	ctx.recurse("lib/isc")
+	ctx.recurse("libisc")
 	if ctx.env.REFCLOCK_PARSE: # Only required by the parse refclock
 		ctx.recurse("libparse")
 	ctx.recurse("libntp")

