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

7 files changed, 27 insertions, 26 deletions

diff --git a/src/engine/amd64_eng/info.txt b/src/engine/amd64_eng/info.txt
index 03baf76ee..2ae2aaad0 100644
--- a/src/engine/amd64_eng/info.txt
+++ b/src/engine/amd64_eng/info.txt
@@ -1,8 +1,3 @@
 define ENGINE_AMD64_ASSEMBLER
 
 load_on dep
-
-<add>
-eng_amd64.cpp
-eng_amd64.h
-</add>
diff --git a/src/engine/def_engine/info.txt b/src/engine/def_engine/info.txt
index e307fbf8e..74b4d3f9b 100644
--- a/src/engine/def_engine/info.txt
+++ b/src/engine/def_engine/info.txt
@@ -1,9 +1,10 @@
 define DEFAULT_ENGINE
 
-load_on auto
-
-<add>
+<header:public>
 def_eng.h
+</header:public>
+
+<source>
 def_mode.cpp
 def_pk_ops.cpp
 def_powm.cpp
@@ -11,7 +12,7 @@ lookup_block.cpp
 lookup_hash.cpp
 lookup_mac.cpp
 lookup_stream.cpp
-</add>
+</source>
 
 <requires>
 algo_factory
diff --git a/src/engine/gnump/info.txt b/src/engine/gnump/info.txt
index 0805c1ba8..9566bded2 100644
--- a/src/engine/gnump/info.txt
+++ b/src/engine/gnump/info.txt
@@ -6,8 +6,15 @@ load_on request
 all -> gmp
 </libs>
 
-<add>
+<header:public>
 eng_gmp.h
+</header:public>
+
+<header:internal>
+gmp_wrap.h
+</header:internal>
+
+<source>
 gmp_dh.cpp
 gmp_dsa.cpp
 gmp_elg.cpp
@@ -16,8 +23,7 @@ gmp_mem.cpp
 gmp_nr.cpp
 gmp_powm.cpp
 gmp_wrap.cpp
-gmp_wrap.h
-</add>
+</source>
 
 <requires>
 bigint
diff --git a/src/engine/ia32_eng/info.txt b/src/engine/ia32_eng/info.txt
index 98fd1f2cc..d2106c555 100644
--- a/src/engine/ia32_eng/info.txt
+++ b/src/engine/ia32_eng/info.txt
@@ -1,8 +1,3 @@
 define ENGINE_IA32_ASSEMBLER
 
 load_on dep
-
-<add>
-eng_ia32.cpp
-eng_ia32.h
-</add>
diff --git a/src/engine/info.txt b/src/engine/info.txt
index dcb26d9d6..b270edaa5 100644
--- a/src/engine/info.txt
+++ b/src/engine/info.txt
@@ -1,10 +1,8 @@
 define ENGINES
 
-load_on auto
-
-<add>
+<header:public>
 engine.h
-</add>
+</header:public>
 
 <requires>
 block
diff --git a/src/engine/openssl/info.txt b/src/engine/openssl/info.txt
index 9f8c84b31..d30e76293 100644
--- a/src/engine/openssl/info.txt
+++ b/src/engine/openssl/info.txt
@@ -6,12 +6,18 @@ load_on request
 all -> crypto
 </libs>
 
-<add>
+<header:public>
+eng_ossl.h
+</header:public>
+
+<header:internal>
+bn_wrap.h
+</header:internal>
+
+<source>
 arc4_openssl.cpp
 bn_powm.cpp
 bn_wrap.cpp
-bn_wrap.h
-eng_ossl.h
 ossl_bc.cpp
 ossl_dh.cpp
 ossl_dsa.cpp
@@ -19,7 +25,7 @@ ossl_elg.cpp
 ossl_if.cpp
 ossl_md.cpp
 ossl_nr.cpp
-</add>
+</source>
 
 <requires>
 bigint
diff --git a/src/engine/simd_engine/simd_engine.cpp b/src/engine/simd_engine/simd_engine.cpp
index fdb1644d0..60ff8ba1d 100644
--- a/src/engine/simd_engine/simd_engine.cpp
+++ b/src/engine/simd_engine/simd_engine.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/simd_engine.h>
-#include <botan/simd_32.h>
+#include <botan/internal/simd_32.h>
 #include <botan/cpuid.h>
 
 #if defined(BOTAN_HAS_SERPENT_SIMD)