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

9 files changed, 59 insertions, 17 deletions

diff --git a/src/utils/asm_amd64/info.txt b/src/utils/asm_amd64/info.txt
index fdfcbcb6a..93405e6ce 100644
--- a/src/utils/asm_amd64/info.txt
+++ b/src/utils/asm_amd64/info.txt
@@ -1,5 +1,9 @@
 load_on dep
 
+<header:internal>
+asm_macr_amd64.h
+</header:internal>
+
 <arch>
 amd64
 </arch>
diff --git a/src/utils/asm_ia32/info.txt b/src/utils/asm_ia32/info.txt
index d19fdd192..d490124f4 100644
--- a/src/utils/asm_ia32/info.txt
+++ b/src/utils/asm_ia32/info.txt
@@ -1,5 +1,9 @@
 load_on dep
 
+<header:internal>
+asm_macr_ia32.h
+</header:internal>
+
 <arch>
 ia32
 </arch>
diff --git a/src/utils/buf_comp/info.txt b/src/utils/buf_comp/info.txt
index 7aea580ce..b91fe5082 100644
--- a/src/utils/buf_comp/info.txt
+++ b/src/utils/buf_comp/info.txt
@@ -1,9 +1,3 @@
-load_on auto
-
-<add>
-buf_comp.h
-</add>
-
 <requires>
 alloc
 </requires>
diff --git a/src/utils/datastor/info.txt b/src/utils/datastor/info.txt
index 9c995adaf..93e938d78 100644
--- a/src/utils/datastor/info.txt
+++ b/src/utils/datastor/info.txt
@@ -1,10 +1,3 @@
-load_on auto
-
-<add>
-datastor.cpp
-datastor.h
-</add>
-
 <requires>
 alloc
 filters
diff --git a/src/utils/info.txt b/src/utils/info.txt
index 110afeb64..7324f55f6 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -2,6 +2,39 @@ define UTIL_FUNCTIONS
 
 load_on always
 
+<source>
+charset.cpp
+cpuid.cpp
+exceptn.cpp
+mlock.cpp
+parsing.cpp
+time.cpp
+ui.cpp
+version.cpp
+</source>
+
+<header:public>
+bit_ops.h
+bswap.h
+charset.h
+cpuid.h
+loadstor.h
+mlock.h
+parsing.h
+prefetch.h
+rotate.h
+rounding.h
+stl_util.h
+time.h
+xor_buf.h
+
+exceptn.h
+mem_ops.h
+types.h
+ui.h
+version.h
+</header:public>
+
 <libs>
 linux,tru64 -> rt
 </libs>
diff --git a/src/utils/simd_32/info.txt b/src/utils/simd_32/info.txt
index 883096a5d..08cbdfa52 100644
--- a/src/utils/simd_32/info.txt
+++ b/src/utils/simd_32/info.txt
@@ -1,3 +1,10 @@
 define SIMD_32
 
 load_on always
+
+<header:internal>
+simd_32.h
+simd_sse.h
+simd_scalar.h
+simd_altivec.h
+</header:internal>
diff --git a/src/utils/simd_32/simd_32.h b/src/utils/simd_32/simd_32.h
index 324db1a7d..38ea078d0 100644
--- a/src/utils/simd_32/simd_32.h
+++ b/src/utils/simd_32/simd_32.h
@@ -12,17 +12,17 @@
 
 #if defined(BOTAN_TARGET_CPU_HAS_SSE2)
 
-  #include <botan/simd_sse.h>
+  #include <botan/internal/simd_sse.h>
   namespace Botan { typedef SIMD_SSE2 SIMD_32; }
 
 #elif defined(BOTAN_TARGET_CPU_HAS_ALTIVEC)
 
-  #include <botan/simd_altivec.h>
+  #include <botan/internal/simd_altivec.h>
   namespace Botan { typedef SIMD_Altivec SIMD_32; }
 
 #else
 
-  #include <botan/simd_scalar.h>
+  #include <botan/internal/simd_scalar.h>
   namespace Botan { typedef SIMD_Scalar SIMD_32; }
 
 #endif
diff --git a/src/utils/simd_32/simd_altivec.h b/src/utils/simd_32/simd_altivec.h
index e1704e76c..9cc5c1068 100644
--- a/src/utils/simd_32/simd_altivec.h
+++ b/src/utils/simd_32/simd_altivec.h
@@ -8,6 +8,8 @@
 #ifndef BOTAN_SIMD_ALTIVEC_H__
 #define BOTAN_SIMD_ALTIVEC_H__
 
+#if defined(BOTAN_TARGET_CPU_HAS_ALTIVEC)
+
 #include <botan/loadstor.h>
 #include <botan/cpuid.h>
 
@@ -207,3 +209,5 @@ class SIMD_Altivec
 }
 
 #endif
+
+#endif
diff --git a/src/utils/simd_32/simd_sse.h b/src/utils/simd_32/simd_sse.h
index 9f03b3733..31bbce2c7 100644
--- a/src/utils/simd_32/simd_sse.h
+++ b/src/utils/simd_32/simd_sse.h
@@ -8,8 +8,9 @@
 #ifndef BOTAN_SIMD_SSE_H__
 #define BOTAN_SIMD_SSE_H__
 
-#include <botan/cpuid.h>
+#if defined(BOTAN_TARGET_CPU_HAS_SSE2)
 
+#include <botan/cpuid.h>
 #include <emmintrin.h>
 
 namespace Botan {
@@ -159,3 +160,5 @@ class SIMD_SSE2
 }
 
 #endif
+
+#endif