libcamera/base: Validate internal headers as private

Headers which must not be exposed as part of the public libcamera API
should include base/private.h.

Any interface which includes the private.h header will only be able to
build if the libcamera_private dependency is used (or the
libcamera_base_private dependency directly).

Build targets which are intended to use the private API's will use the
libcamera_private to handle the automatic definition of the inclusion
guard.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

14 files changed, 15 insertions, 15 deletions

diff --git a/test/camera/meson.build b/test/camera/meson.build
index 9cb95aff..002a87b5 100644
--- a/test/camera/meson.build
+++ b/test/camera/meson.build
@@ -12,7 +12,7 @@ camera_tests = [
 
 foreach t : camera_tests
     exe = executable(t[0], t[1],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : test_libraries,
                      include_directories : test_includes_internal)
     test(t[0], exe, suite : 'camera', is_parallel : false)
diff --git a/test/ipa/meson.build b/test/ipa/meson.build
index e8a041b5..7938633e 100644
--- a/test/ipa/meson.build
+++ b/test/ipa/meson.build
@@ -7,7 +7,7 @@ ipa_test = [
 
 foreach t : ipa_test
     exe = executable(t[0], [t[1], libcamera_generated_ipa_headers],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : [libipa, test_libraries],
                      include_directories : [libipa_includes, test_includes_internal])
 
diff --git a/test/ipc/meson.build b/test/ipc/meson.build
index ad47b2fe..2a6cd7fb 100644
--- a/test/ipc/meson.build
+++ b/test/ipc/meson.build
@@ -7,7 +7,7 @@ ipc_tests = [
 
 foreach t : ipc_tests
     exe = executable(t[0], t[1],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : test_libraries,
                      include_directories : test_includes_internal)
 
diff --git a/test/libtest/meson.build b/test/libtest/meson.build
index 542335ea..351629f3 100644
--- a/test/libtest/meson.build
+++ b/test/libtest/meson.build
@@ -18,7 +18,7 @@ test_includes_internal = [
 ]
 
 libtest = static_library('libtest', libtest_sources,
-                         dependencies : libcamera_dep,
+                         dependencies : libcamera_private,
                          include_directories : test_includes_internal)
 
 test_libraries = [libtest]
diff --git a/test/log/meson.build b/test/log/meson.build
index 8cd664e0..ac87841a 100644
--- a/test/log/meson.build
+++ b/test/log/meson.build
@@ -7,7 +7,7 @@ log_test = [
 
 foreach t : log_test
     exe = executable(t[0], t[1],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : test_libraries,
                      include_directories : test_includes_internal)
 
diff --git a/test/media_device/meson.build b/test/media_device/meson.build
index 1dfcdd8b..83dfe8f1 100644
--- a/test/media_device/meson.build
+++ b/test/media_device/meson.build
@@ -11,12 +11,12 @@ media_device_tests = [
 ]
 
 lib_mdev_test = static_library('lib_mdev_test', lib_mdev_test_sources,
-                               dependencies : libcamera_dep,
+                               dependencies : libcamera_private,
                                include_directories : test_includes_internal)
 
 foreach t : media_device_tests
     exe = executable(t[0], t[1],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : [test_libraries, lib_mdev_test],
                      include_directories : test_includes_internal)
 
diff --git a/test/meson.build b/test/meson.build
index 045ad2a2..b8615e0f 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -64,7 +64,7 @@ endforeach
 
 foreach t : internal_tests
     exe = executable(t[0], t[1],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : test_libraries,
                      include_directories : test_includes_internal)
 
diff --git a/test/pipeline/ipu3/meson.build b/test/pipeline/ipu3/meson.build
index d062ecd2..16701080 100644
--- a/test/pipeline/ipu3/meson.build
+++ b/test/pipeline/ipu3/meson.build
@@ -6,7 +6,7 @@ ipu3_test = [
 
 foreach t : ipu3_test
     exe = executable(t[0], t[1],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : test_libraries,
                      include_directories : test_includes_internal)
 
diff --git a/test/pipeline/rkisp1/meson.build b/test/pipeline/rkisp1/meson.build
index ece147b0..364b5711 100644
--- a/test/pipeline/rkisp1/meson.build
+++ b/test/pipeline/rkisp1/meson.build
@@ -6,7 +6,7 @@ rkisp1_test = [
 
 foreach t : rkisp1_test
     exe = executable(t[0], t[1],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : test_libraries,
                      include_directories : test_includes_internal)
 
diff --git a/test/process/meson.build b/test/process/meson.build
index d2272d50..af86b277 100644
--- a/test/process/meson.build
+++ b/test/process/meson.build
@@ -6,7 +6,7 @@ process_tests = [
 
 foreach t : process_tests
     exe = executable(t[0], t[1],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : test_libraries,
                      include_directories : test_includes_internal)
 
diff --git a/test/serialization/generated_serializer/meson.build b/test/serialization/generated_serializer/meson.build
index 2460e0b1..9fb9cd1d 100644
--- a/test/serialization/generated_serializer/meson.build
+++ b/test/serialization/generated_serializer/meson.build
@@ -8,7 +8,7 @@ exe = executable('generated_serializer_test',
                      generated_test_header,
                      generated_test_serializer,
                  ],
-                 dependencies : libcamera_dep,
+                 dependencies : libcamera_private,
                  link_with : test_libraries,
                  include_directories : [
                      test_includes_internal,
diff --git a/test/serialization/meson.build b/test/serialization/meson.build
index 60ebf325..5446e490 100644
--- a/test/serialization/meson.build
+++ b/test/serialization/meson.build
@@ -9,7 +9,7 @@ serialization_tests = [
 
 foreach t : serialization_tests
     exe = executable(t[0], [t[1], 'serialization_test.cpp'],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : test_libraries,
                      include_directories : test_includes_internal)
     test(t[0], exe, suite : 'serialization', is_parallel : true)
diff --git a/test/v4l2_subdevice/meson.build b/test/v4l2_subdevice/meson.build
index 40d39766..d82be3c6 100644
--- a/test/v4l2_subdevice/meson.build
+++ b/test/v4l2_subdevice/meson.build
@@ -7,7 +7,7 @@ v4l2_subdevice_tests = [
 
 foreach t : v4l2_subdevice_tests
     exe = executable(t[0], [t[1], 'v4l2_subdevice_test.cpp'],
-        dependencies : libcamera_dep,
+        dependencies : libcamera_private,
         link_with : test_libraries,
         include_directories : test_includes_internal)
     test(t[0], exe, suite : 'v4l2_subdevice', is_parallel : false)
diff --git a/test/v4l2_videodevice/meson.build b/test/v4l2_videodevice/meson.build
index e733518c..643f82ed 100644
--- a/test/v4l2_videodevice/meson.build
+++ b/test/v4l2_videodevice/meson.build
@@ -16,7 +16,7 @@ v4l2_videodevice_tests = [
 
 foreach t : v4l2_videodevice_tests
     exe = executable(t[0], [t[1], 'v4l2_videodevice_test.cpp'],
-                     dependencies : libcamera_dep,
+                     dependencies : libcamera_private,
                      link_with : test_libraries,
                      include_directories : test_includes_internal)
     test(t[0], exe, suite : 'v4l2_videodevice', is_parallel : false)