Full working amalgamation build, plus internal-only headers concept.

18 files changed, 70 insertions, 23 deletions

diff --git a/src/entropy/beos_stats/info.txt b/src/entropy/beos_stats/info.txt
index 26c3feb75..088b926f9 100644
--- a/src/entropy/beos_stats/info.txt
+++ b/src/entropy/beos_stats/info.txt
@@ -1,6 +1,12 @@
 define ENTROPY_SRC_BEOS
 
-load_on auto
+<source>
+es_beos.cpp
+</source>
+
+<header:internal>
+es_beos.h
+</header:internal>
 
 <os>
 beos
diff --git a/src/entropy/cryptoapi_rng/info.txt b/src/entropy/cryptoapi_rng/info.txt
index a07892971..800e9ee52 100644
--- a/src/entropy/cryptoapi_rng/info.txt
+++ b/src/entropy/cryptoapi_rng/info.txt
@@ -1,6 +1,12 @@
 define ENTROPY_SRC_CAPI
 
-load_on auto
+<source>
+es_capi.cpp
+</source>
+
+<header:internal>
+es_capi.h
+</header:internal>
 
 # We'll just assume CAPI is there; this is OK except for 3.x, early
 # versions of 95, and maybe NT 3.5
diff --git a/src/entropy/dev_random/es_dev.cpp b/src/entropy/dev_random/dev_random.cpp
index ef3074194..d0babfd1e 100644
--- a/src/entropy/dev_random/es_dev.cpp
+++ b/src/entropy/dev_random/dev_random.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/es_dev.h>
+#include <botan/internal/dev_random.h>
 
 #include <sys/types.h>
 #include <sys/select.h>
diff --git a/src/entropy/dev_random/es_dev.h b/src/entropy/dev_random/dev_random.h
index df9dbe1c1..df9dbe1c1 100644
--- a/src/entropy/dev_random/es_dev.h
+++ b/src/entropy/dev_random/dev_random.h
diff --git a/src/entropy/dev_random/info.txt b/src/entropy/dev_random/info.txt
index 2907d4178..cabb47ea2 100644
--- a/src/entropy/dev_random/info.txt
+++ b/src/entropy/dev_random/info.txt
@@ -1,6 +1,12 @@
-define ENTROPY_SRC_DEVICE
+define ENTROPY_SRC_DEV_RANDOM
 
-load_on auto
+<source>
+dev_random.cpp
+</source>
+
+<header:internal>
+dev_random.h
+</header:internal>
 
 <os>
 aix
diff --git a/src/entropy/egd/es_egd.cpp b/src/entropy/egd/es_egd.cpp
index 9e37f8f17..bd8dc8590 100644
--- a/src/entropy/egd/es_egd.cpp
+++ b/src/entropy/egd/es_egd.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/es_egd.h>
+#include <botan/internal/es_egd.h>
 #include <botan/parsing.h>
 #include <botan/exceptn.h>
 #include <cstring>
diff --git a/src/entropy/egd/info.txt b/src/entropy/egd/info.txt
index be6380fc9..25117ed09 100644
--- a/src/entropy/egd/info.txt
+++ b/src/entropy/egd/info.txt
@@ -1,6 +1,12 @@
 define ENTROPY_SRC_EGD
 
-load_on auto
+<source>
+es_egd.cpp
+</source>
+
+<header:internal>
+es_egd.h
+</header:internal>
 
 <libs>
 solaris -> socket
diff --git a/src/entropy/hres_timer/hres_timer.cpp b/src/entropy/hres_timer/hres_timer.cpp
index 74ea801c4..73282d8d2 100644
--- a/src/entropy/hres_timer/hres_timer.cpp
+++ b/src/entropy/hres_timer/hres_timer.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/hres_timer.h>
+#include <botan/internal/hres_timer.h>
 #include <botan/cpuid.h>
 #include <botan/time.h>
 
diff --git a/src/entropy/hres_timer/info.txt b/src/entropy/hres_timer/info.txt
index 6c6454f5d..6e542aac8 100644
--- a/src/entropy/hres_timer/info.txt
+++ b/src/entropy/hres_timer/info.txt
@@ -1 +1,9 @@
 define ENTROPY_SRC_HIGH_RESOLUTION_TIMER
+
+<source>
+hres_timer.cpp
+</source>
+
+<header:internal>
+hres_timer.h
+</header:internal>
diff --git a/src/entropy/info.txt b/src/entropy/info.txt
index 5f3d39dd5..a048df7d9 100644
--- a/src/entropy/info.txt
+++ b/src/entropy/info.txt
@@ -1,9 +1,3 @@
-load_on auto
-
-<add>
-entropy_src.h
-</add>
-
 <requires>
 buf_comp
 </requires>
diff --git a/src/entropy/proc_walk/es_ftw.cpp b/src/entropy/proc_walk/es_ftw.cpp
index 2016f099a..5e2b17860 100644
--- a/src/entropy/proc_walk/es_ftw.cpp
+++ b/src/entropy/proc_walk/es_ftw.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/es_ftw.h>
+#include <botan/internal/es_ftw.h>
 #include <botan/secmem.h>
 #include <cstring>
 #include <deque>
diff --git a/src/entropy/proc_walk/info.txt b/src/entropy/proc_walk/info.txt
index 50b67980a..fd65d8ffe 100644
--- a/src/entropy/proc_walk/info.txt
+++ b/src/entropy/proc_walk/info.txt
@@ -1,6 +1,12 @@
 define ENTROPY_SRC_FTW
 
-load_on auto
+<source>
+es_ftw.cpp
+</source>
+
+<header:internal>
+es_ftw.h
+</header:internal>
 
 <os>
 aix
diff --git a/src/entropy/unix_procs/es_unix.cpp b/src/entropy/unix_procs/es_unix.cpp
index fc5b026a4..039479308 100644
--- a/src/entropy/unix_procs/es_unix.cpp
+++ b/src/entropy/unix_procs/es_unix.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/es_unix.h>
-#include <botan/unix_cmd.h>
+#include <botan/internal/es_unix.h>
+#include <botan/internal/unix_cmd.h>
 #include <botan/parsing.h>
 #include <algorithm>
 #include <sys/time.h>
diff --git a/src/entropy/unix_procs/es_unix.h b/src/entropy/unix_procs/es_unix.h
index 1f8abb784..283405e19 100644
--- a/src/entropy/unix_procs/es_unix.h
+++ b/src/entropy/unix_procs/es_unix.h
@@ -9,7 +9,7 @@
 #define BOTAN_ENTROPY_SRC_UNIX_H__
 
 #include <botan/entropy_src.h>
-#include <botan/unix_cmd.h>
+#include <botan/internal/unix_cmd.h>
 #include <vector>
 
 namespace Botan {
diff --git a/src/entropy/unix_procs/info.txt b/src/entropy/unix_procs/info.txt
index 529b56966..2100584e4 100644
--- a/src/entropy/unix_procs/info.txt
+++ b/src/entropy/unix_procs/info.txt
@@ -1,6 +1,15 @@
 define ENTROPY_SRC_UNIX
 
-load_on auto
+<source>
+es_unix.cpp
+unix_cmd.cpp
+unix_src.cpp
+</source>
+
+<header:internal>
+es_unix.h
+unix_cmd.h
+</header:internal>
 
 <os>
 aix
diff --git a/src/entropy/unix_procs/unix_cmd.cpp b/src/entropy/unix_procs/unix_cmd.cpp
index 1cae07e26..34e7c314a 100644
--- a/src/entropy/unix_procs/unix_cmd.cpp
+++ b/src/entropy/unix_procs/unix_cmd.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/unix_cmd.h>
+#include <botan/internal/unix_cmd.h>
 #include <botan/parsing.h>
 #include <botan/exceptn.h>
 
diff --git a/src/entropy/unix_procs/unix_src.cpp b/src/entropy/unix_procs/unix_src.cpp
index c843af6c2..a72ecf055 100644
--- a/src/entropy/unix_procs/unix_src.cpp
+++ b/src/entropy/unix_procs/unix_src.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/es_unix.h>
+#include <botan/internal/es_unix.h>
 
 namespace Botan {
 
diff --git a/src/entropy/win32_stats/info.txt b/src/entropy/win32_stats/info.txt
index 3af05d502..0972df898 100644
--- a/src/entropy/win32_stats/info.txt
+++ b/src/entropy/win32_stats/info.txt
@@ -1,6 +1,12 @@
 define ENTROPY_SRC_WIN32
 
-load_on auto
+<source>
+es_win32.cpp
+</source>
+
+<header:internal>
+es_win32.h
+</header:internal>
 
 <os>
 windows