Refactor: Switch to a more directory based source file structure.

Mass change all of the code to further utilize directories.
The project has gotten big enough for this to matter.
The stable API should have a relatively clean directory structure.

diff --git a/build/level_0/settings b/build/level_0/settings
index 945774661f23de3e65798537a6f9840d6c85f709..b1d519fe07b9744ac60aab981342247c3060f202 100644 (file)
--- a/build/level_0/settings
+++ b/build/level_0/settings
@@ -33,27 +33,29 @@ build_objects_program_shared
 build_objects_program_static
 build_sources_library account.c private-account.c
 build_sources_library capability.c
-build_sources_library color.c color-common.c
-build_sources_library console.c console-common.c
-build_sources_library control_group.c control_group-common.c
-build_sources_library conversion.c conversion-common.c private-conversion.c
+build_sources_library color.c color/common.c
+build_sources_library console.c console/common.c
+build_sources_library control_group.c control_group/common.c
+build_sources_library conversion.c private-conversion.c conversion/common.c
 build_sources_library directory.c private-directory.c
 build_sources_library environment.c private-environment.c
 build_sources_library execute.c
-build_sources_library file.c file-common.c private-file.c
-build_sources_library fss.c private-fss.c fss-common.c fss_named.c fss_nest.c fss_set.c
-build_sources_library iki.c iki-common.c private-iki.c
+build_sources_library file.c file/common.c private-file.c
+build_sources_library fss.c private-fss.c fss/common.c fss/named.c fss/nest.c fss/set.c
+build_sources_library iki.c iki/common.c private-iki.c
 build_sources_library limit.c
-build_sources_library memory.c memory_structure.c private-memory.c
-build_sources_library path.c path-common.c private-path.c
-build_sources_library pipe.c print.c print_to.c print-common.c private-print.c private-print_to.c
-build_sources_library serialize.c serialize-common.c private-serialize.c
+build_sources_library memory.c private-memory.c memory/structure.c
+build_sources_library path.c private-path.c path/common.c
+build_sources_library pipe.c
+build_sources_library print.c private-print.c print/common.c print/to.c print/private-to.c
+build_sources_library serialize.c private-serialize.c serialize/common.c
 build_sources_library signal.c
 build_sources_library socket.c
-build_sources_library status_string.c string.c string-common.c private-string.c string_dynamic.c string_map.c string_quantity.c string_range.c string_triple.c
+build_sources_library status_string.c
+build_sources_library string.c private-string.c string/common.c string/dynamic.c string/map.c string/quantity.c string/range.c string/triple.c
 build_sources_library type_array/array_length.c type_array/cell.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/state.c type_array/status.c
 build_sources_library type_array/private-array_length.c type_array/private-cell.c type_array/private-fll_id.c type_array/private-int8.c type_array/private-int16.c type_array/private-int32.c type_array/private-int64.c type_array/private-int128.c type_array/private-state.c type_array/private-status.c
-build_sources_library utf.c utf-common.c utf_dynamic.c utf_map.c utf_string.c utf_triple.c private-utf.c private-utf-is_unassigned.c private-utf_string.c
+build_sources_library utf.c private-utf.c utf/common.c utf/dynamic.c utf/map.c utf/private-is_unassigned.c utf/private-string.c utf/string.c utf/triple.c
 build_sources_library-level thread.c private-thread.c
 build_sources_library_shared
 build_sources_library_static
@@ -63,33 +65,34 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers account.h account-common.h
-build_sources_headers capability.h capability-common.h
-build_sources_headers color.h color-common.h
-build_sources_headers console.h console-common.h
-build_sources_headers control_group.h control_group-common.h
-build_sources_headers conversion.h conversion-common.h
-build_sources_headers directory.h directory_type.h directory-common.h
-build_sources_headers environment.h environment-common.h
-build_sources_headers execute.h execute-common.h
-build_sources_headers file.h file-common.h
-build_sources_headers fss.h fss-common.h fss_comment.h fss_delimit.h fss_named.h fss_nest.h fss_quote.h fss_set.h
-build_sources_headers iki.h iki-common.h
-build_sources_headers limit.h limit-common.h
-build_sources_headers memory.h memory_structure.h memory-common.h
-build_sources_headers path.h path-common.h
+build_sources_headers account.h account/common.h
+build_sources_headers capability.h capability/common.h
+build_sources_headers color.h color/common.h
+build_sources_headers console.h console/common.h
+build_sources_headers control_group.h control_group/common.h
+build_sources_headers conversion.h conversion/common.h
+build_sources_headers directory.h directory/common.h directory/type.h
+build_sources_headers environment.h environment/common.h
+build_sources_headers execute.h execute/common.h
+build_sources_headers file.h file/common.h
+build_sources_headers fss.h fss/comment.h fss/common.h fss/delimit.h fss/named.h fss/nest.h fss/quote.h fss/set.h
+build_sources_headers iki.h iki/common.h
+build_sources_headers limit.h limit/common.h
+build_sources_headers memory.h memory/structure.h memory/common.h
+build_sources_headers path.h path/common.h
 build_sources_headers pipe.h
-build_sources_headers print.h print_to.h print-common.h
-build_sources_headers serialize.h serialize-common.h
-build_sources_headers signal.h signal-common.h
-build_sources_headers socket.h socket-common.h
-build_sources_headers status.h status_string.h
-build_sources_headers string.h string-common.h string_dynamic.h string_map.h string_quantity.h string_range.h string_triple.h
+build_sources_headers print.h print/to.h print/common.h
+build_sources_headers serialize.h serialize/common.h
+build_sources_headers signal.h signal/common.h
+build_sources_headers socket.h socket/common.h
+build_sources_headers status.h
+build_sources_headers status_string.h
+build_sources_headers string.h string/common.h string/dynamic.h string/map.h string/quantity.h string/range.h string/triple.h
 build_sources_headers type.h
-build_sources_headers type_array.h type_array-common.h
+build_sources_headers type_array.h type_array/common.h
 build_sources_headers type_array/array_length.h type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/state.h type_array/status.h
-build_sources_headers utf.h utf-common.h utf_dynamic.h utf_map.h utf_string.h utf_triple.h
-build_sources_headers-level thread.h thread-common.h
+build_sources_headers utf.h utf/common.h utf/dynamic.h utf/map.h utf/string.h utf/triple.h
+build_sources_headers-level thread.h thread/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/build/level_1/settings b/build/level_1/settings
index 0b83f525f5c5f1fc61c34d207b26f2f8d845f7b7..600e7e25f56d37d595e491f57277d4bddfc45ab2 100644 (file)
--- a/build/level_1/settings
+++ b/build/level_1/settings
@@ -35,13 +35,13 @@ build_sources_library control_group.c
 build_sources_library conversion.c private-conversion.c
 build_sources_library directory.c private-directory.c
 build_sources_library environment.c
-build_sources_library private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c
+build_sources_library private-fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c
 build_sources_library iki.c
-build_sources_library print.c print-common.c private-print.c
+build_sources_library print.c private-print.c print/common.c
 build_sources_library signal.c
-build_sources_library string.c
-build_sources_library private-string.c
-build_sources_library utf.c private-utf.c utf_file.c private-utf_file.c
+build_sources_library string.c private-string.c
+build_sources_library utf.c private-utf.c
+build_sources_library utf_file.c private-utf_file.c
 build_sources_library-level
 build_sources_library_shared
 build_sources_library_static
@@ -53,15 +53,16 @@ build_sources_program_shared
 build_sources_program_static
 build_sources_headers control_group.h
 build_sources_headers conversion.h
-build_sources_headers directory.h directory-common.h
+build_sources_headers directory.h directory/common.h
 build_sources_headers environment.h
-build_sources_headers execute.h execute-common.h
-build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h
+build_sources_headers execute.h execute/common.h
+build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h
 build_sources_headers iki.h
-build_sources_headers print.h print-common.h
-build_sources_headers signal.h signal-common.h
+build_sources_headers print.h print/common.h
+build_sources_headers signal.h signal/common.h
 build_sources_headers string.h
-build_sources_headers utf.h utf_file.h
+build_sources_headers utf.h
+build_sources_headers utf_file.h
 build_sources_headers-level
 build_sources_headers_shared
 build_sources_headers_static

diff --git a/build/level_2/settings b/build/level_2/settings
index 15f8b268a0061b48e626792bcaab72cd2c622f1f..f3a41962ba33da1f67d9354fb6fb9ba63024ad36 100644 (file)
--- a/build/level_2/settings
+++ b/build/level_2/settings
@@ -32,15 +32,15 @@ build_objects_program
 build_objects_program_shared
 build_objects_program_static
 build_sources_library control_group.c
-build_sources_library error.c error-common.c private-error.c
+build_sources_library error.c private-error.c error/common.c
 build_sources_library execute.c private-execute.c
 build_sources_library file.c private-file.c
-build_sources_library fss.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c fss_payload.c
+build_sources_library fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c fss/payload.c
 build_sources_library fss_status_string.c
 build_sources_library iki.c private-iki.c
 build_sources_library path.c
 build_sources_library print.c
-build_sources_library program.c program-common.c
+build_sources_library program.c program/common.c
 build_sources_library status_string.c
 build_sources_library-level
 build_sources_library_shared
@@ -52,15 +52,15 @@ build_sources_program
 build_sources_program_shared
 build_sources_program_static
 build_sources_headers control_group.h
-build_sources_headers error.h error-common.h
+build_sources_headers error.h error/common.h
 build_sources_headers execute.h
 build_sources_headers file.h
-build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_payload.h
+build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h fss/payload.h
 build_sources_headers fss_status_string.h
 build_sources_headers iki.h
 build_sources_headers path.h
 build_sources_headers print.h
-build_sources_headers program.h program-common.h
+build_sources_headers program.h program/common.h
 build_sources_headers status_string.h
 build_sources_headers-level
 build_sources_headers_shared

diff --git a/build/monolithic/settings b/build/monolithic/settings
index 217b36ee486fad43315e6bfc3b98a82757d297c3..02e65affb203aab6750825fe91b63ff09dba2c13 100644 (file)
--- a/build/monolithic/settings
+++ b/build/monolithic/settings
@@ -33,42 +33,50 @@ build_objects_program_shared
 build_objects_program_static
 build_sources_library level_0/account.c level_0/private-account.c
 build_sources_library level_0/capability.c
-build_sources_library level_0/color.c level_0/color-common.c
-build_sources_library level_0/console.c level_0/console-common.c
-build_sources_library level_0/control_group.c level_0/control_group-common.c
-build_sources_library level_0/conversion.c level_0/conversion-common.c level_0/private-conversion.c
+build_sources_library level_0/color.c level_0/color/common.c
+build_sources_library level_0/console.c level_0/console/common.c
+build_sources_library level_0/control_group.c level_0/control_group/common.c
+build_sources_library level_0/conversion.c level_0/private-conversion.c level_0/conversion/common.c
 build_sources_library level_0/directory.c level_0/private-directory.c
 build_sources_library level_0/environment.c level_0/private-environment.c
-build_sources_library level_0/execute.c level_0/file.c level_0/file-common.c level_0/private-file.c
-build_sources_library level_0/fss.c level_0/private-fss.c level_0/fss-common.c level_0/fss_named.c level_0/fss_nest.c level_0/fss_set.c
-build_sources_library level_0/iki.c level_0/iki-common.c level_0/private-iki.c
+build_sources_library level_0/execute.c
+build_sources_library level_0/file.c level_0/file/common.c level_0/private-file.c
+build_sources_library level_0/fss.c level_0/private-fss.c level_0/fss/common.c level_0/fss/named.c level_0/fss/nest.c level_0/fss/set.c
+build_sources_library level_0/iki.c level_0/iki/common.c level_0/private-iki.c
 build_sources_library level_0/limit.c
-build_sources_library level_0/memory.c level_0/memory_structure.c level_0/private-memory.c
-build_sources_library level_0/path.c level_0/path-common.c level_0/private-path.c
+build_sources_library level_0/memory.c level_0/private-memory.c level_0/memory/structure.c
+build_sources_library level_0/path.c level_0/private-path.c level_0/path/common.c
 build_sources_library level_0/pipe.c
-build_sources_library level_0/print.c level_0/print_to.c level_0/print-common.c level_0/private-print.c level_0/private-print_to.c
-build_sources_library level_0/serialize.c level_0/serialize-common.c level_0/private-serialize.c
+build_sources_library level_0/print.c level_0/private-print.c level_0/print/common.c level_0/print/to.c level_0/print/private-to.c
+build_sources_library level_0/serialize.c level_0/private-serialize.c level_0/serialize/common.c
 build_sources_library level_0/signal.c
 build_sources_library level_0/socket.c
-build_sources_library level_0/status_string.c level_0/string.c level_0/string-common.c level_0/private-string.c level_0/string_dynamic.c level_0/string_map.c level_0/string_quantity.c level_0/string_range.c level_0/string_triple.c
+build_sources_library level_0/status_string.c
+build_sources_library level_0/string.c level_0/private-string.c level_0/string/common.c level_0/string/dynamic.c level_0/string/map.c level_0/string/quantity.c level_0/string/range.c level_0/string/triple.c
 build_sources_library level_0/type_array/array_length.c level_0/type_array/cell.c level_0/type_array/fll_id.c level_0/type_array/int8.c level_0/type_array/int16.c level_0/type_array/int32.c level_0/type_array/int64.c level_0/type_array/int128.c level_0/type_array/state.c level_0/type_array/status.c
 build_sources_library level_0/type_array/private-array_length.c level_0/type_array/private-cell.c level_0/type_array/private-fll_id.c level_0/type_array/private-int8.c level_0/type_array/private-int16.c level_0/type_array/private-int32.c level_0/type_array/private-int64.c level_0/type_array/private-int128.c level_0/type_array/private-state.c level_0/type_array/private-status.c
-build_sources_library level_0/utf.c level_0/utf-common.c level_0/utf_dynamic.c level_0/utf_map.c level_0/utf_string.c level_0/utf_triple.c level_0/private-utf.c level_0/private-utf-is_unassigned.c level_0/private-utf_string.c
-build_sources_library level_1/control_group.c level_1/conversion.c level_1/private-conversion.c
+build_sources_library level_0/utf.c level_0/private-utf.c level_0/utf/common.c level_0/utf/dynamic.c level_0/utf/map.c level_0/utf/string.c level_0/utf/triple.c level_0/utf/private-is_unassigned.c level_0/utf/private-string.c
+build_sources_library level_1/control_group.c
+build_sources_library level_1/conversion.c level_1/private-conversion.c
 build_sources_library level_1/directory.c level_1/private-directory.c
 build_sources_library level_1/environment.c
-build_sources_library level_1/private-fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_embedded_list.c level_1/fss_extended.c level_1/fss_extended_list.c
+build_sources_library level_1/private-fss.c level_1/fss/basic.c level_1/fss/basic_list.c level_1/fss/embedded_list.c level_1/fss/extended.c level_1/fss/extended_list.c
 build_sources_library level_1/iki.c
-build_sources_library level_1/print.c level_1/print-common.c level_1/private-print.c level_1/signal.c level_1/string.c level_1/private-string.c
-build_sources_library level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c
+build_sources_library level_1/print.c level_1/private-print.c level_1/print/common.c
+build_sources_library level_1/signal.c
+build_sources_library level_1/string.c level_1/private-string.c
+build_sources_library level_1/utf.c level_1/private-utf.c
+build_sources_library level_1/utf_file.c level_1/private-utf_file.c
 build_sources_library level_2/control_group.c
-build_sources_library level_2/error.c level_2/error-common.c level_2/private-error.c
+build_sources_library level_2/error.c level_2/error/common.c level_2/private-error.c
 build_sources_library level_2/execute.c level_2/private-execute.c
 build_sources_library level_2/file.c level_2/private-file.c
-build_sources_library level_2/fss.c level_2/private-fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_embedded_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_payload.c level_2/fss_status_string.c
+build_sources_library level_2/fss.c level_2/fss/basic.c level_2/fss/basic_list.c level_2/fss/embedded_list.c level_2/fss/extended.c level_2/fss/extended_list.c level_2/fss/payload.c
+build_sources_library level_2/fss_status_string.c
 build_sources_library level_2/iki.c level_2/private-iki.c
-build_sources_library level_2/path.c level_2/print.c
-build_sources_library level_2/program.c level_2/program-common.c
+build_sources_library level_2/path.c
+build_sources_library level_2/print.c
+build_sources_library level_2/program.c level_2/program/common.c
 build_sources_library level_2/status_string.c
 build_sources_library-monolithic level_0/thread.c level_0/private-thread.c
 build_sources_library_shared
@@ -79,54 +87,58 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers level_0/account.h level_0/account-common.h
-build_sources_headers level_0/capability.h level_0/capability-common.h
-build_sources_headers level_0/color.h level_0/color-common.h
-build_sources_headers level_0/console.h level_0/console-common.h
-build_sources_headers level_0/control_group.h level_0/control_group-common.h
-build_sources_headers level_0/conversion.h level_0/conversion-common.h
-build_sources_headers level_0/directory.h level_0/directory_type.h level_0/directory-common.h
-build_sources_headers level_0/environment.h level_0/environment-common.h
-build_sources_headers level_0/execute.h level_0/execute-common.h
-build_sources_headers level_0/file.h level_0/file-common.h
-build_sources_headers level_0/fss.h level_0/fss-common.h level_0/fss_comment.h level_0/fss_delimit.h level_0/fss_named.h level_0/fss_nest.h level_0/fss_quote.h level_0/fss_set.h
-build_sources_headers level_0/iki.h level_0/iki-common.h
-build_sources_headers level_0/limit.h level_0/limit-common.h
-build_sources_headers level_0/memory.h level_0/memory_structure.h level_0/memory-common.h
-build_sources_headers level_0/path.h level_0/path-common.h
+build_sources_headers level_0/account.h level_0/account/common.h
+build_sources_headers level_0/capability.h level_0/capability/common.h
+build_sources_headers level_0/color.h level_0/color/common.h
+build_sources_headers level_0/console.h level_0/console/common.h
+build_sources_headers level_0/control_group.h level_0/control_group/common.h
+build_sources_headers level_0/conversion.h level_0/conversion/common.h
+build_sources_headers level_0/directory.h level_0/directory/common.h level_0/directory/type.h
+build_sources_headers level_0/environment.h level_0/environment/common.h
+build_sources_headers level_0/execute.h level_0/execute/common.h
+build_sources_headers level_0/file.h level_0/file/common.h
+build_sources_headers level_0/fss.h level_0/fss/comment.h level_0/fss/common.h level_0/fss/delimit.h level_0/fss/named.h level_0/fss/nest.h level_0/fss/quote.h level_0/fss/set.h
+build_sources_headers level_0/iki.h level_0/iki/common.h
+build_sources_headers level_0/limit.h level_0/limit/common.h
+build_sources_headers level_0/memory.h level_0/memory/structure.h level_0/memory/common.h
+build_sources_headers level_0/path.h level_0/path/common.h
 build_sources_headers level_0/pipe.h
-build_sources_headers level_0/print.h level_0/print_to.h level_0/print-common.h
-build_sources_headers level_0/serialize.h level_0/serialize-common.h
-build_sources_headers level_0/signal.h level_0/signal-common.h
-build_sources_headers level_0/socket.h level_0/socket-common.h
-build_sources_headers level_0/status.h level_0/status_string.h
-build_sources_headers level_0/string.h level_0/string-common.h level_0/string_dynamic.h level_0/string_map.h level_0/string_quantity.h level_0/string_range.h level_0/string_triple.h
+build_sources_headers level_0/print.h level_0/print/to.h level_0/print/common.h
+build_sources_headers level_0/serialize.h level_0/serialize/common.h
+build_sources_headers level_0/signal.h level_0/signal/common.h
+build_sources_headers level_0/socket.h level_0/socket/common.h
+build_sources_headers level_0/status.h
+build_sources_headers level_0/status_string.h
+build_sources_headers level_0/string.h level_0/string/common.h level_0/string/dynamic.h level_0/string/map.h level_0/string/quantity.h level_0/string/range.h level_0/string/triple.h
 build_sources_headers level_0/type.h
-build_sources_headers level_0/type_array.h level_0/type_array-common.h
+build_sources_headers level_0/type_array.h level_0/type_array/common.h
 build_sources_headers level_0/type_array/array_length.h level_0/type_array/cell.h level_0/type_array/fll_id.h level_0/type_array/int8.h level_0/type_array/int16.h level_0/type_array/int32.h level_0/type_array/int64.h level_0/type_array/int128.h level_0/type_array/state.h level_0/type_array/status.h
-build_sources_headers level_0/utf.h level_0/utf-common.h level_0/utf_dynamic.h level_0/utf_map.h level_0/utf_string.h level_0/utf_triple.h
+build_sources_headers level_0/utf.h level_0/utf/common.h level_0/utf/dynamic.h level_0/utf/map.h level_0/utf/string.h level_0/utf/triple.h
 build_sources_headers level_1/control_group.h
 build_sources_headers level_1/conversion.h
-build_sources_headers level_1/directory.h level_1/directory-common.h
+build_sources_headers level_1/directory.h level_1/directory/common.h
 build_sources_headers level_1/environment.h
-build_sources_headers level_1/execute.h level_1/execute-common.h
-build_sources_headers level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_embedded_list.h level_1/fss_extended.h level_1/fss_extended_list.h
+build_sources_headers level_1/execute.h level_1/execute/common.h
+build_sources_headers level_1/fss.h level_1/fss/basic.h level_1/fss/basic_list.h level_1/fss/embedded_list.h level_1/fss/extended.h level_1/fss/extended_list.h
 build_sources_headers level_1/iki.h
-build_sources_headers level_1/print.h level_1/print-common.h
-build_sources_headers level_1/signal.h level_1/signal-common.h
+build_sources_headers level_1/print.h level_1/print/common.h
+build_sources_headers level_1/signal.h level_1/signal/common.h
 build_sources_headers level_1/string.h
-build_sources_headers level_1/utf.h level_1/utf_file.h
+build_sources_headers level_1/utf.h
+build_sources_headers level_1/utf_file.h
 build_sources_headers level_2/control_group.h
-build_sources_headers level_2/error.h level_2/error-common.h
+build_sources_headers level_2/error.h level_2/error/common.h
 build_sources_headers level_2/execute.h
 build_sources_headers level_2/file.h
-build_sources_headers level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_embedded_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_payload.h level_2/fss_status_string.h
+build_sources_headers level_2/fss.h level_2/fss/basic.h level_2/fss/basic_list.h level_2/fss/embedded_list.h level_2/fss/extended.h level_2/fss/extended_list.h level_2/fss/payload.h
+build_sources_headers level_2/fss_status_string.h
 build_sources_headers level_2/iki.h
 build_sources_headers level_2/path.h
 build_sources_headers level_2/print.h
-build_sources_headers level_2/program.h level_2/program-common.h
+build_sources_headers level_2/program.h level_2/program/common.h
 build_sources_headers level_2/status_string.h
-build_sources_headers-monolithic level_0/thread.h level_0/thread-common.h
+build_sources_headers-level level_0/thread.h level_0/thread/common.h
+build_sources_headers-monolithic level_0/thread.h level_0/thread/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_account/c/account.h b/level_0/f_account/c/account.h
index e91038e5124053d457b225a3c8459375ac3fc4e8..7be1e31d06e3ee5c9ccba7188bc0838525ff34ca 100644 (file)
--- a/level_0/f_account/c/account.h
+++ b/level_0/f_account/c/account.h
@@ -25,8 +25,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 account includes.
-#include <fll/level_0/account-common.h>
+// FLL-0 account includes.
+#include <fll/level_0/account/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_account/c/account-common.h b/level_0/f_account/c/account/common.h
similarity index 100%
rename from level_0/f_account/c/account-common.h
rename to level_0/f_account/c/account/common.h

diff --git a/level_0/f_account/data/build/settings b/level_0/f_account/data/build/settings
index 90930ed96dd0bbfae870a7fd35ad85d7afe9cf2e..d47a10b74bbe416077b0e2799b4d3217e1cce8f9 100644 (file)
--- a/level_0/f_account/data/build/settings
+++ b/level_0/f_account/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers account.h account-common.h
+build_sources_headers account.h account/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_account/data/build/settings-mocks b/level_0/f_account/data/build/settings-mocks
index ff841149b94880a9e0dfebc36557bbb8b5b009e0..0cc20cc44426755ce57ba9e43f8001939c5e1380 100644 (file)
--- a/level_0/f_account/data/build/settings-mocks
+++ b/level_0/f_account/data/build/settings-mocks
@@ -27,7 +27,7 @@ build_libraries_static
 build_sources_library account.c private-account.c ../../tests/unit/c/mock-account.c
 build_sources_library_shared
 build_sources_library_static
-build_sources_headers account.h account-common.h
+build_sources_headers account.h account/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_script yes

diff --git a/level_0/f_capability/c/capability.h b/level_0/f_capability/c/capability.h
index 8e36cdc2fe9f1d5ff562bb29491e858edc1c3f98..60c3fa54a5bd18836e4c894bd076d3c8ce413e64 100644 (file)
--- a/level_0/f_capability/c/capability.h
+++ b/level_0/f_capability/c/capability.h
@@ -41,8 +41,8 @@
 #include <fll/level_0/type_array.h>
 #include <fll/level_0/string.h>
 
-// fll-0 capability includes
-#include <fll/level_0/capability-common.h>
+// FLL-0 capability includes.
+#include <fll/level_0/capability/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_capability/c/capability-common.h b/level_0/f_capability/c/capability/common.h
similarity index 100%
rename from level_0/f_capability/c/capability-common.h
rename to level_0/f_capability/c/capability/common.h

diff --git a/level_0/f_capability/data/build/settings b/level_0/f_capability/data/build/settings
index 42ad843f5a19228bb26854564e56cd5668f1751d..1e05f6e1e7a8cfb5a02a9ad1ac3ae76bd41ae096 100644 (file)
--- a/level_0/f_capability/data/build/settings
+++ b/level_0/f_capability/data/build/settings
@@ -26,7 +26,7 @@ build_libraries_shared
 build_libraries_static
 build_objects_library
 build_objects_library_shared
-build_objects_library_staticx
+build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers capability.h capability-common.h
+build_sources_headers capability.h capability/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_capability/data/build/settings-mocks b/level_0/f_capability/data/build/settings-mocks
index a2770a6b557efc66d56775e859322f3abf719f0f..b37ffc57fc4f510185db0501f937cde0ed95041d 100644 (file)
--- a/level_0/f_capability/data/build/settings-mocks
+++ b/level_0/f_capability/data/build/settings-mocks
@@ -32,7 +32,7 @@ build_libraries_static
 build_sources_library capability.c ../../tests/unit/c/mock-capability.c
 build_sources_library_shared
 build_sources_library_static
-build_sources_headers capability.h capability-common.h
+build_sources_headers capability.h capability/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_color/c/color.h b/level_0/f_color/c/color.h
index cee267c27db9d894a71be468022f9120b3dd300c..3c32c29913cfa0006b74ba1cdb2aa0060d0d11bd 100644 (file)
--- a/level_0/f_color/c/color.h
+++ b/level_0/f_color/c/color.h
@@ -24,8 +24,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 color includes.
-#include <fll/level_0/color-common.h>
+// FLL-0 color includes.
+#include <fll/level_0/color/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_color/c/color-common.c b/level_0/f_color/c/color/common.c
similarity index 99%
rename from level_0/f_color/c/color-common.c
rename to level_0/f_color/c/color/common.c
index 93a98bccec687a3bcbcb334409b0f5c2d70ab88c..bf7c1378772231cc803bcc59f08f81901c34c58d 100644 (file)
--- a/level_0/f_color/c/color-common.c
+++ b/level_0/f_color/c/color/common.c
@@ -1,4 +1,4 @@
-#include "color.h"
+#include "../color.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_color/c/color-common.h b/level_0/f_color/c/color/common.h
similarity index 100%
rename from level_0/f_color/c/color-common.h
rename to level_0/f_color/c/color/common.h

diff --git a/level_0/f_color/data/build/settings b/level_0/f_color/data/build/settings
index 5508bfda2f01cd1f92ee60d693efdc438a90fca1..05c1b2ec30899b143270b0ee91deba07f030cd45 100644 (file)
--- a/level_0/f_color/data/build/settings
+++ b/level_0/f_color/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library color.c color-common.c
+build_sources_library color.c color/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers color.h color-common.h
+build_sources_headers color.h color/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_color/data/build/settings-mocks b/level_0/f_color/data/build/settings-mocks
index f04b3f0f8ca6223a69690bac576543284a98a7fd..89ec40521a5d00a443581c4d18f242bce21bb730 100644 (file)
--- a/level_0/f_color/data/build/settings-mocks
+++ b/level_0/f_color/data/build/settings-mocks
@@ -24,10 +24,10 @@ build_libraries -lc
 build_libraries-individual -lf_memory -lf_string
 build_libraries_shared
 build_libraries_static
-build_sources_library color.c color-common.c ../../tests/unit/c/mock-color.c
+build_sources_library color.c color/common.c ../../tests/unit/c/mock-color.c
 build_sources_library_shared
 build_sources_library_static
-build_sources_headers color.h color-common.h
+build_sources_headers color.h color/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_console/c/console.h b/level_0/f_console/c/console.h
index f8e0dc02193b34fec0d4a010e39be097d1fd0e7d..c32163abf2b4fb0f8fd4a366aa5ad3c4820c7e18 100644 (file)
--- a/level_0/f_console/c/console.h
+++ b/level_0/f_console/c/console.h
@@ -22,7 +22,7 @@
 #include <fll/level_0/utf.h>
 
 // fll-0 console includes
-#include <fll/level_0/console-common.h>
+#include <fll/level_0/console/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_console/c/console-common.c b/level_0/f_console/c/console/common.c
similarity index 99%
rename from level_0/f_console/c/console-common.c
rename to level_0/f_console/c/console/common.c
index 0b05b64ac54655e75184c7c5c8817e959cfa0282..e2b9a4e29eae712f0435f28570c971dbb02546f0 100644 (file)
--- a/level_0/f_console/c/console-common.c
+++ b/level_0/f_console/c/console/common.c
@@ -1,4 +1,4 @@
-#include "console.h"
+#include "../console.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_console/c/console-common.h b/level_0/f_console/c/console/common.h
similarity index 100%
rename from level_0/f_console/c/console-common.h
rename to level_0/f_console/c/console/common.h

diff --git a/level_0/f_console/data/build/settings b/level_0/f_console/data/build/settings
index e4536fdb7a232dd17895f401d0044fa869d0f48b..9d3792d0110b60183e27312e7131508f5a98463c 100644 (file)
--- a/level_0/f_console/data/build/settings
+++ b/level_0/f_console/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library console.c console-common.c
+build_sources_library console.c console/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers console.h console-common.h
+build_sources_headers console.h console/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_control_group/c/control_group.h b/level_0/f_control_group/c/control_group.h
index c409ad2761329b63d11e84586c100d741a268521..36ecce88a978c4de8d0db49f9cfcc93946b67e9a 100644 (file)
--- a/level_0/f_control_group/c/control_group.h
+++ b/level_0/f_control_group/c/control_group.h
@@ -25,7 +25,7 @@
 #include <fll/level_0/string.h>
 
 // FLL-1 control includes.
-#include <fll/level_0/control_group-common.h>
+#include <fll/level_0/control_group/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_control_group/c/control_group-common.c b/level_0/f_control_group/c/control_group/common.c
similarity index 96%
rename from level_0/f_control_group/c/control_group-common.c
rename to level_0/f_control_group/c/control_group/common.c
index 6fbfa76db9c203c72b81e69a4e5e02be08282745..3eebb8acec8722250708ee04504939f2671e6ca4 100644 (file)
--- a/level_0/f_control_group/c/control_group-common.c
+++ b/level_0/f_control_group/c/control_group/common.c
@@ -1,4 +1,4 @@
-#include "control_group.h"
+#include "../control_group.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_control_group/c/control_group-common.h b/level_0/f_control_group/c/control_group/common.h
similarity index 100%
rename from level_0/f_control_group/c/control_group-common.h
rename to level_0/f_control_group/c/control_group/common.h

diff --git a/level_0/f_control_group/data/build/settings b/level_0/f_control_group/data/build/settings
index 2ec64ca2726dfe9d2103134620c15f4ec16117b8..c61a6b147224d746797037ecca2fa9c4e3c067ab 100644 (file)
--- a/level_0/f_control_group/data/build/settings
+++ b/level_0/f_control_group/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library control_group.c control_group-common.c
+build_sources_library control_group.c control_group/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers control_group.h control_group-common.h
+build_sources_headers control_group.h control_group/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_conversion/c/conversion.h b/level_0/f_conversion/c/conversion.h
index bafef570ef0342b3252b0f4d7542b31bc01e5c4d..80f3efa7d2715ddb3049f46e76f5ac1fd455f0a1 100644 (file)
--- a/level_0/f_conversion/c/conversion.h
+++ b/level_0/f_conversion/c/conversion.h
@@ -25,8 +25,8 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 conversion includes
-#include <fll/level_0/conversion-common.h>
+// FLL-0 conversion includes.
+#include <fll/level_0/conversion/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_conversion/c/conversion-common.c b/level_0/f_conversion/c/conversion/common.c
similarity index 96%
rename from level_0/f_conversion/c/conversion-common.c
rename to level_0/f_conversion/c/conversion/common.c
index 1b7a7243e12731ca891dc210ea212c13837a75c8..5fe41c684d7fb7a4adbec07f28ca83e9160c4d72 100644 (file)
--- a/level_0/f_conversion/c/conversion-common.c
+++ b/level_0/f_conversion/c/conversion/common.c
@@ -1,4 +1,4 @@
-#include "conversion.h"
+#include "../conversion.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_conversion/c/conversion-common.h b/level_0/f_conversion/c/conversion/common.h
similarity index 100%
rename from level_0/f_conversion/c/conversion-common.h
rename to level_0/f_conversion/c/conversion/common.h

diff --git a/level_0/f_conversion/data/build/settings b/level_0/f_conversion/data/build/settings
index 9b4614ac0237ba155ee643f9f7216aab9b44c3d3..04da0e28a280e1e694fecdb5f3f4bc80b94fba5a 100644 (file)
--- a/level_0/f_conversion/data/build/settings
+++ b/level_0/f_conversion/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library conversion.c conversion-common.c private-conversion.c
+build_sources_library conversion.c private-conversion.c conversion/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers conversion.h conversion-common.h
+build_sources_headers conversion.h conversion/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_conversion/data/build/settings-mocks b/level_0/f_conversion/data/build/settings-mocks
index 034b5915f71dbcd264ff29f1cc44445c2c1951b8..19ce47e0c70ec73cae95a4eea95675175e1c602a 100644 (file)
--- a/level_0/f_conversion/data/build/settings-mocks
+++ b/level_0/f_conversion/data/build/settings-mocks
@@ -24,10 +24,10 @@ build_libraries -lc
 build_libraries-individual -lf_memory -lf_string -lf_utf
 build_libraries_shared
 build_libraries_static
-build_sources_library conversion.c conversion-common.c private-conversion.c ../../tests/unit/c/mock-conversion.c
+build_sources_library conversion.c private-conversion.c conversion/common.c ../../tests/unit/c/mock-conversion.c
 build_sources_library_shared
 build_sources_library_static
-build_sources_headers conversion.h conversion-common.h
+build_sources_headers conversion.h conversion/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_directory/c/directory.h b/level_0/f_directory/c/directory.h
index edf692ac0a058f2f00483c60caef1f362f443126..b7bb93aa383302db3c8b4be4bb729cacd6f8434a 100644 (file)
--- a/level_0/f_directory/c/directory.h
+++ b/level_0/f_directory/c/directory.h
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-// work-around for out-dated systems.
+// Work-around for systems requiring special defines to properly include ftw.h.
 #ifndef __USE_XOPEN_EXTENDED
   #define __USE_XOPEN_EXTENDED
   #include <ftw.h>
@@ -35,10 +35,10 @@
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
-#include <fll/level_0/directory_type.h>
 
-// fll-0 directory includes
-#include <fll/level_0/directory-common.h>
+// FLL-0 directory includes.
+#include <fll/level_0/directory/common.h>
+#include <fll/level_0/directory/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_directory/c/directory-common.h b/level_0/f_directory/c/directory/common.h
similarity index 95%
rename from level_0/f_directory/c/directory-common.h
rename to level_0/f_directory/c/directory/common.h
index ccafda1224b9f7d8d66909f17c254669f040b9a3..5eb3f54062648d028fafa30fcdf03271bd0607e9 100644 (file)
--- a/level_0/f_directory/c/directory-common.h
+++ b/level_0/f_directory/c/directory/common.h
@@ -70,7 +70,12 @@ extern "C" {
   #define F_directory_default_allocation_step_d F_memory_default_allocation_small_d
 
   #define F_directory_descriptors_max_d 255
-  #define F_directory_name_max_d        NAME_MAX
+
+  #ifdef NAME_MAX
+    #define F_directory_name_max_d NAME_MAX
+  #else
+    #define F_directory_name_max_d 255
+  #endif // NAME_MAX
 #endif // _di_f_directory_limitations_
 
 #ifdef __cplusplus

diff --git a/level_0/f_directory/c/directory_type.h b/level_0/f_directory/c/directory/type.h
similarity index 97%
rename from level_0/f_directory/c/directory_type.h
rename to level_0/f_directory/c/directory/type.h
index 4e33113034e45054b90b21b986c0cd31295390ba..03cddf78967da6f64717c204d9495123b395b690 100644 (file)
--- a/level_0/f_directory/c/directory_type.h
+++ b/level_0/f_directory/c/directory/type.h
@@ -5,17 +5,13 @@
  * API Version: 0.5
  * Licenses: lgpl-2.1-or-later
  *
- * Provides directory related data types.
+ * Defines type-specific data to be used for/by project directory.
+ *
+ * This is auto-included by directory.h and should not need to be explicitly included.
  */
 #ifndef _F_directory_type_h
 #define _F_directory_type_h
 
-// FLL-0 includes.
-#include <fll/level_0/status.h>
-#include <fll/level_0/memory.h>
-#include <fll/level_0/string.h>
-#include <fll/level_0/type.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/level_0/f_directory/data/build/settings b/level_0/f_directory/data/build/settings
index 309c0acf057767b7c3225273ab66b9638ae84232..02e69f0a998b9eda5a9ace2ad266e5f38eb5dcee 100644 (file)
--- a/level_0/f_directory/data/build/settings
+++ b/level_0/f_directory/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers directory.h directory_type.h directory-common.h
+build_sources_headers directory.h directory/common.h directory/type.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_environment/c/environment.h b/level_0/f_environment/c/environment.h
index 506e495fcab887f07d6837f396ffd641e19dab9e..7f98959ac43460ff7c96004e88b7bfddfdb1e393 100644 (file)
--- a/level_0/f_environment/c/environment.h
+++ b/level_0/f_environment/c/environment.h
@@ -20,8 +20,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 environment includes
-#include <fll/level_0/environment-common.h>
+// FLL-0 environment includes.
+#include <fll/level_0/environment/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_environment/c/environment-common.h b/level_0/f_environment/c/environment/common.h
similarity index 100%
rename from level_0/f_environment/c/environment-common.h
rename to level_0/f_environment/c/environment/common.h

diff --git a/level_0/f_environment/data/build/settings b/level_0/f_environment/data/build/settings
index 2d91bfd1baf4e6c30463a6c5a5c6d6c5a9f16737..a87541dfe2b7e1ce06c19119420054958115c31e 100644 (file)
--- a/level_0/f_environment/data/build/settings
+++ b/level_0/f_environment/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers environment.h environment-common.h
+build_sources_headers environment.h environment/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_execute/c/execute.h b/level_0/f_execute/c/execute.h
index a8f5b70b8a4d0ad31f1283c82c86da6728df821f..a2c611a075fedf3627e111d2747e41695b11799b 100644 (file)
--- a/level_0/f_execute/c/execute.h
+++ b/level_0/f_execute/c/execute.h
@@ -10,7 +10,7 @@
 #ifndef _F_execute_h
 #define _F_execute_h
 
-// include pre-requirements
+// Include pre-requirements.
 #define _GNU_SOURCE
 
 // Libc includes.
@@ -23,8 +23,8 @@
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 
-// fll-0 execute includes
-#include <fll/level_0/execute-common.h>
+// FLL-0 execute includes.
+#include <fll/level_0/execute/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_execute/c/execute-common.h b/level_0/f_execute/c/execute/common.h
similarity index 100%
rename from level_0/f_execute/c/execute-common.h
rename to level_0/f_execute/c/execute/common.h

diff --git a/level_0/f_execute/data/build/settings b/level_0/f_execute/data/build/settings
index fd6d612d301aa9faa8a1d2092dd411fcc2ba18b8..a45ce4dfcb9b7df8bab90d22bd73aa1b63401ac7 100644 (file)
--- a/level_0/f_execute/data/build/settings
+++ b/level_0/f_execute/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers execute.h execute-common.h
+build_sources_headers execute.h execute/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_file/c/file.h b/level_0/f_file/c/file.h
index 61ca77527edb97b258693b37adda3ee514e54ba1..d10aaa2fd9cba2a690e33193da5c03eb0442e72c 100644 (file)
--- a/level_0/f_file/c/file.h
+++ b/level_0/f_file/c/file.h
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-// non-standard libc includs
+// Non-standard libc includes.
 #include <sys/sysmacros.h>
 
 // FLL-0 includes.
@@ -37,8 +37,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 file includes
-#include <fll/level_0/file-common.h>
+// FLL-0 file includes.
+#include <fll/level_0/file/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_file/c/file-common.c b/level_0/f_file/c/file/common.c
similarity index 99%
rename from level_0/f_file/c/file-common.c
rename to level_0/f_file/c/file/common.c
index 1bbb23579228435bb6d8c1766080b6f14d756d9d..92c2b63037d2052673696683b4954d9ae87cb68e 100644 (file)
--- a/level_0/f_file/c/file-common.c
+++ b/level_0/f_file/c/file/common.c
@@ -1,5 +1,4 @@
-#include "file.h"
-#include "private-file.h"
+#include "../file.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_file/c/file-common.h b/level_0/f_file/c/file/common.h
similarity index 100%
rename from level_0/f_file/c/file-common.h
rename to level_0/f_file/c/file/common.h

diff --git a/level_0/f_file/data/build/settings b/level_0/f_file/data/build/settings
index e2ef5ab05518b223c016c5a67388353fd63c73e6..1fbef1d406a376f0ed4bf15b534ee1573c71a1fe 100644 (file)
--- a/level_0/f_file/data/build/settings
+++ b/level_0/f_file/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library file.c file-common.c private-file.c
+build_sources_library file.c private-file.c file/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers file.h file-common.h
+build_sources_headers file.h file/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h
index b684a1e7ef61badc98a8278eb2704473f20de3c4..db930812a571c1452f8ea05acb342be8742435c2 100644 (file)
--- a/level_0/f_fss/c/fss.h
+++ b/level_0/f_fss/c/fss.h
@@ -23,14 +23,14 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 fss includes
-#include <fll/level_0/fss-common.h>
-#include <fll/level_0/fss_comment.h>
-#include <fll/level_0/fss_delimit.h>
-#include <fll/level_0/fss_quote.h>
-#include <fll/level_0/fss_named.h>
-#include <fll/level_0/fss_nest.h>
-#include <fll/level_0/fss_set.h>
+// FLL-0 fss includes.
+#include <fll/level_0/fss/comment.h>
+#include <fll/level_0/fss/common.h>
+#include <fll/level_0/fss/delimit.h>
+#include <fll/level_0/fss/quote.h>
+#include <fll/level_0/fss/named.h>
+#include <fll/level_0/fss/nest.h>
+#include <fll/level_0/fss/set.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_comment.c b/level_0/f_fss/c/fss/comment.c
similarity index 66%
rename from level_0/f_fss/c/fss_comment.c
rename to level_0/f_fss/c/fss/comment.c
index be126fd77a807e10f648ad10ca994f4315655e65..6ee9a40c9725c6ad81643e3cb5a8ca2089fcb861 100644 (file)
--- a/level_0/f_fss/c/fss_comment.c
+++ b/level_0/f_fss/c/fss/comment.c
@@ -1,5 +1,4 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_comment.h b/level_0/f_fss/c/fss/comment.h
similarity index 100%
rename from level_0/f_fss/c/fss_comment.h
rename to level_0/f_fss/c/fss/comment.h

diff --git a/level_0/f_fss/c/fss-common.c b/level_0/f_fss/c/fss/common.c
similarity index 91%
rename from level_0/f_fss/c/fss-common.c
rename to level_0/f_fss/c/fss/common.c
index e8dffa02ba6c9853753499b8c73592637b8838c5..f5b017426c757c1ba7e71df0eeb262808d70e774 100644 (file)
--- a/level_0/f_fss/c/fss-common.c
+++ b/level_0/f_fss/c/fss/common.c
@@ -1,5 +1,4 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss-common.h b/level_0/f_fss/c/fss/common.h
similarity index 100%
rename from level_0/f_fss/c/fss-common.h
rename to level_0/f_fss/c/fss/common.h

diff --git a/level_0/f_fss/c/fss_delimit.c b/level_0/f_fss/c/fss/delimit.c
similarity index 66%
rename from level_0/f_fss/c/fss_delimit.c
rename to level_0/f_fss/c/fss/delimit.c
index be126fd77a807e10f648ad10ca994f4315655e65..6ee9a40c9725c6ad81643e3cb5a8ca2089fcb861 100644 (file)
--- a/level_0/f_fss/c/fss_delimit.c
+++ b/level_0/f_fss/c/fss/delimit.c
@@ -1,5 +1,4 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_delimit.h b/level_0/f_fss/c/fss/delimit.h
similarity index 100%
rename from level_0/f_fss/c/fss_delimit.h
rename to level_0/f_fss/c/fss/delimit.h

diff --git a/level_0/f_fss/c/fss_named.c b/level_0/f_fss/c/fss/named.c
similarity index 99%
rename from level_0/f_fss/c/fss_named.c
rename to level_0/f_fss/c/fss/named.c
index 2ccf8d3919907753106341bbbec3374ee9c506c4..9b07b644826b13544fb1b861fb755c83b1c6f7e4 100644 (file)
--- a/level_0/f_fss/c/fss_named.c
+++ b/level_0/f_fss/c/fss/named.c
@@ -1,5 +1,5 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
+#include "../private-fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_named.h b/level_0/f_fss/c/fss/named.h
similarity index 100%
rename from level_0/f_fss/c/fss_named.h
rename to level_0/f_fss/c/fss/named.h

diff --git a/level_0/f_fss/c/fss_nest.c b/level_0/f_fss/c/fss/nest.c
similarity index 99%
rename from level_0/f_fss/c/fss_nest.c
rename to level_0/f_fss/c/fss/nest.c
index 2004b20d3bba5d5a5893b03e00b658637b430aa4..e3ef8c05f0e2cc023953dd35e6a1ba361990a0e8 100644 (file)
--- a/level_0/f_fss/c/fss_nest.c
+++ b/level_0/f_fss/c/fss/nest.c
@@ -1,5 +1,5 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
+#include "../private-fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_nest.h b/level_0/f_fss/c/fss/nest.h
similarity index 100%
rename from level_0/f_fss/c/fss_nest.h
rename to level_0/f_fss/c/fss/nest.h

diff --git a/level_0/f_fss/c/fss_quote.h b/level_0/f_fss/c/fss/quote.h
similarity index 100%
rename from level_0/f_fss/c/fss_quote.h
rename to level_0/f_fss/c/fss/quote.h

diff --git a/level_0/f_fss/c/fss_set.c b/level_0/f_fss/c/fss/set.c
similarity index 99%
rename from level_0/f_fss/c/fss_set.c
rename to level_0/f_fss/c/fss/set.c
index fad3db104e34f86323d7308271bff4b0d936253d..1562a9e284ccf1bf9b30ebdf9145cc42e6b5248d 100644 (file)
--- a/level_0/f_fss/c/fss_set.c
+++ b/level_0/f_fss/c/fss/set.c
@@ -1,5 +1,5 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
+#include "../private-fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_set.h b/level_0/f_fss/c/fss/set.h
similarity index 100%
rename from level_0/f_fss/c/fss_set.h
rename to level_0/f_fss/c/fss/set.h

diff --git a/level_0/f_fss/data/build/settings b/level_0/f_fss/data/build/settings
index cd92aefc52a70893455f38b0972792a5f646fc97..7ee06f742f7aded560b779d804b3ab74a0505ab7 100644 (file)
--- a/level_0/f_fss/data/build/settings
+++ b/level_0/f_fss/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library fss.c private-fss.c fss-common.c fss_named.c fss_nest.c fss_set.c
+build_sources_library fss.c private-fss.c fss/common.c fss/named.c fss/nest.c fss/set.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers fss.h fss-common.h fss_comment.h fss_delimit.h fss_named.h fss_nest.h fss_quote.h fss_set.h
+build_sources_headers fss.h fss/comment.h fss/common.h fss/delimit.h fss/named.h fss/nest.h fss/quote.h fss/set.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_iki/c/iki.h b/level_0/f_iki/c/iki.h
index 30ee183f135e5c12eda7710c908d22bcedaffa59..59965dab33446c4ca2840475c25ef131ed25c28c 100644 (file)
--- a/level_0/f_iki/c/iki.h
+++ b/level_0/f_iki/c/iki.h
@@ -25,8 +25,8 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 iki includes
-#include <fll/level_0/iki-common.h>
+// FLL-0 iki includes.
+#include <fll/level_0/iki/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_iki/c/iki-common.c b/level_0/f_iki/c/iki/common.c
similarity index 98%
rename from level_0/f_iki/c/iki-common.c
rename to level_0/f_iki/c/iki/common.c
index 90d927950c2a2d98b53511e11185a716524a0aab..5af824ef9236a79bd5776ddf990cd7ce035b96c0 100644 (file)
--- a/level_0/f_iki/c/iki-common.c
+++ b/level_0/f_iki/c/iki/common.c
@@ -1,5 +1,4 @@
-#include "iki.h"
-#include "private-iki.h"
+#include "../iki.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_iki/c/iki-common.h b/level_0/f_iki/c/iki/common.h
similarity index 100%
rename from level_0/f_iki/c/iki-common.h
rename to level_0/f_iki/c/iki/common.h

diff --git a/level_0/f_iki/data/build/settings b/level_0/f_iki/data/build/settings
index 489a727f8bfa3d54d35d1010b6472c610163e2fb..3221c17569d75b2e17b05d94a306909871b3fdbd 100644 (file)
--- a/level_0/f_iki/data/build/settings
+++ b/level_0/f_iki/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library iki.c iki-common.c private-iki.c
+build_sources_library iki.c private-iki.c iki/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers iki.h iki-common.h
+build_sources_headers iki.h iki/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_limit/c/limit.h b/level_0/f_limit/c/limit.h
index a2c19867a09dbb53ef5a4b590329bd8f9c8cb03c..0ebcf9c41a3a6139d5a87d135b96715f0a93f137 100644 (file)
--- a/level_0/f_limit/c/limit.h
+++ b/level_0/f_limit/c/limit.h
@@ -22,8 +22,8 @@
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
 
-// fll-0 control includes
-#include <fll/level_0/limit-common.h>
+// FLL-0 control includes.
+#include <fll/level_0/limit/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_limit/c/limit-common.h b/level_0/f_limit/c/limit/common.h
similarity index 100%
rename from level_0/f_limit/c/limit-common.h
rename to level_0/f_limit/c/limit/common.h

diff --git a/level_0/f_limit/data/build/settings b/level_0/f_limit/data/build/settings
index 05d6f04c053d15abef4d57234b5e585399f062e0..2a24b91ddfee63a4671c05b00e5bf0aa1117fbc8 100644 (file)
--- a/level_0/f_limit/data/build/settings
+++ b/level_0/f_limit/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers limit.h limit-common.h
+build_sources_headers limit.h limit/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_memory/c/memory.h b/level_0/f_memory/c/memory.h
index 6950923aa8019424fe0dd13c8ea14019e3b9aa1c..1b741728a4462a33fa2d80e4ad96aea06f71faf5 100644 (file)
--- a/level_0/f_memory/c/memory.h
+++ b/level_0/f_memory/c/memory.h
@@ -19,9 +19,9 @@
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 
-// fll-0 memory includes
-#include <fll/level_0/memory-common.h>
-#include <fll/level_0/memory_structure.h>
+// FLL-0 memory includes.
+#include <fll/level_0/memory/common.h>
+#include <fll/level_0/memory/structure.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_memory/c/memory-common.h b/level_0/f_memory/c/memory/common.h
similarity index 100%
rename from level_0/f_memory/c/memory-common.h
rename to level_0/f_memory/c/memory/common.h

diff --git a/level_0/f_memory/c/memory_structure.c b/level_0/f_memory/c/memory/structure.c
similarity index 98%
rename from level_0/f_memory/c/memory_structure.c
rename to level_0/f_memory/c/memory/structure.c
index 9fc2414db1bcbb51534e43dc24751873451d8ee8..a2ef196ff8421e3939e9a151f7199b475a6e9038 100644 (file)
--- a/level_0/f_memory/c/memory_structure.c
+++ b/level_0/f_memory/c/memory/structure.c
@@ -1,5 +1,5 @@
-#include "memory.h"
-#include "private-memory.h"
+#include "../memory.h"
+#include "../private-memory.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_memory/c/memory_structure.h b/level_0/f_memory/c/memory/structure.h
similarity index 100%
rename from level_0/f_memory/c/memory_structure.h
rename to level_0/f_memory/c/memory/structure.h

diff --git a/level_0/f_memory/data/build/settings b/level_0/f_memory/data/build/settings
index c1cd152fe604df91efc7a603db554a7f367a04f2..2b0b78b28bb263b03aeb08f68a7483de0fde6fef 100644 (file)
--- a/level_0/f_memory/data/build/settings
+++ b/level_0/f_memory/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library memory.c memory_structure.c private-memory.c
+build_sources_library memory.c private-memory.c memory/structure.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers memory.h memory_structure.h memory-common.h
+build_sources_headers memory.h memory/common.h memory/structure.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_path/c/path.h b/level_0/f_path/c/path.h
index b862b7c8433f3ff5ecef6d87b5ca4406197e18e4..9b4d06c44c12285ef9ddca2f4f91547dbf0eb10c 100644 (file)
--- a/level_0/f_path/c/path.h
+++ b/level_0/f_path/c/path.h
@@ -26,8 +26,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 path includes
-#include <fll/level_0/path-common.h>
+// FLL-0 path includes.
+#include <fll/level_0/path/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_path/c/path-common.c b/level_0/f_path/c/path/common.c
similarity index 99%
rename from level_0/f_path/c/path-common.c
rename to level_0/f_path/c/path/common.c
index 117d3fdafba8713e0e542d3069daaff802cdf075..bcbf96fd8e2d87d497cb7728dbdfc7ba6cd61362 100644 (file)
--- a/level_0/f_path/c/path-common.c
+++ b/level_0/f_path/c/path/common.c
@@ -1,5 +1,4 @@
-#include "path.h"
-#include "private-path.h"
+#include "../path.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_path/c/path-common.h b/level_0/f_path/c/path/common.h
similarity index 100%
rename from level_0/f_path/c/path-common.h
rename to level_0/f_path/c/path/common.h

diff --git a/level_0/f_path/data/build/settings b/level_0/f_path/data/build/settings
index d6a9f92dd321169b12a42f10864f4220559caf51..a7c458a9d8c2bd4fe3796eaac8e8bb44c196562f 100644 (file)
--- a/level_0/f_path/data/build/settings
+++ b/level_0/f_path/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library path.c path-common.c private-path.c
+build_sources_library path.c private-path.c path/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers path.h path-common.h
+build_sources_headers path.h path/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_pipe/data/build/settings b/level_0/f_pipe/data/build/settings
index ffec130cee2616617caca99b6dab4f9f072ec1a8..ff00b19e992037e8496244d62c376e030525bb73 100644 (file)
--- a/level_0/f_pipe/data/build/settings
+++ b/level_0/f_pipe/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_print/c/print.h b/level_0/f_print/c/print.h
index d876e403404b55e8a778d04dabfdf3144b7d6d77..ea6e00bad117fea81714e8f6c4fad47d9215a4b1 100644 (file)
--- a/level_0/f_print/c/print.h
+++ b/level_0/f_print/c/print.h
@@ -28,9 +28,9 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 print includes
-#include <fll/level_0/print-common.h>
-#include <fll/level_0/print_to.h>
+// FLL-0 print includes.
+#include <fll/level_0/print/common.h>
+#include <fll/level_0/print/to.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_print/c/print-common.c b/level_0/f_print/c/print/common.c
similarity index 99%
rename from level_0/f_print/c/print-common.c
rename to level_0/f_print/c/print/common.c
index 75946eb4f7075ebf95fb03ff52ee8ac84192032c..e804e35bf60a7a93fb377970560cc7aaad750a0a 100644 (file)
--- a/level_0/f_print/c/print-common.c
+++ b/level_0/f_print/c/print/common.c
@@ -1,5 +1,4 @@
-#include "print.h"
-#include "private-print.h"
+#include "../print.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_print/c/print-common.h b/level_0/f_print/c/print/common.h
similarity index 100%
rename from level_0/f_print/c/print-common.h
rename to level_0/f_print/c/print/common.h

diff --git a/level_0/f_print/c/private-print_to.c b/level_0/f_print/c/print/private-to.c
similarity index 99%
rename from level_0/f_print/c/private-print_to.c
rename to level_0/f_print/c/print/private-to.c
index b20d5220891b22e2261b835d7b821fe52122e8f9..f92dd4ec270ca1366f40c29f57a5a24a5d5f62f7 100644 (file)
--- a/level_0/f_print/c/private-print_to.c
+++ b/level_0/f_print/c/print/private-to.c
@@ -1,6 +1,6 @@
-#include "print.h"
-#include "private-print.h"
-#include "private-print_to.h"
+#include "../print.h"
+#include "../private-print.h"
+#include "private-to.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_print/c/private-print_to.h b/level_0/f_print/c/print/private-to.h
similarity index 100%
rename from level_0/f_print/c/private-print_to.h
rename to level_0/f_print/c/print/private-to.h

diff --git a/level_0/f_print/c/print_to.c b/level_0/f_print/c/print/to.c
similarity index 99%
rename from level_0/f_print/c/print_to.c
rename to level_0/f_print/c/print/to.c
index 7341d4844737a9fc5af84f33dd596b34589cefc4..4411acbe58d0b9b5d806d76b0fc95862a241b8ba 100644 (file)
--- a/level_0/f_print/c/print_to.c
+++ b/level_0/f_print/c/print/to.c
@@ -1,6 +1,6 @@
-#include "print.h"
-#include "private-print.h"
-#include "private-print_to.h"
+#include "../print.h"
+#include "../private-print.h"
+#include "private-to.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_print/c/print_to.h b/level_0/f_print/c/print/to.h
similarity index 100%
rename from level_0/f_print/c/print_to.h
rename to level_0/f_print/c/print/to.h

diff --git a/level_0/f_print/data/build/settings b/level_0/f_print/data/build/settings
index 6b7dbedd0a4a7eb37e76b4ae7e520aefd49fdb8a..8b415a8580f18b26af762fda8fe737248259a3e9 100644 (file)
--- a/level_0/f_print/data/build/settings
+++ b/level_0/f_print/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library print.c print_to.c print-common.c private-print.c private-print_to.c
+build_sources_library print.c private-print.c print/common.c print/to.c print/private-to.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers print.h print_to.h print-common.h
+build_sources_headers print.h print/common.h print/to.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_serialize/c/serialize.h b/level_0/f_serialize/c/serialize.h
index 419f159d80fd717b91c44d1afbdc69ae9733b38f..4b482ae9be778e99bf8719fe6d1321b391ccec6f 100644 (file)
--- a/level_0/f_serialize/c/serialize.h
+++ b/level_0/f_serialize/c/serialize.h
@@ -22,8 +22,8 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 serialize includes
-#include <fll/level_0/serialize-common.h>
+// FLL-0 serialize includes.
+#include <fll/level_0/serialize/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_serialize/c/serialize-common.c b/level_0/f_serialize/c/serialize/common.c
similarity index 92%
rename from level_0/f_serialize/c/serialize-common.c
rename to level_0/f_serialize/c/serialize/common.c
index 363d047bfe1ca1552581b865a93becf23de88958..99063dd7e09e9d0855d336a450f4ad610846c061 100644 (file)
--- a/level_0/f_serialize/c/serialize-common.c
+++ b/level_0/f_serialize/c/serialize/common.c
@@ -1,5 +1,4 @@
-#include "serialize.h"
-#include "private-serialize.h"
+#include "../serialize.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_serialize/c/serialize-common.h b/level_0/f_serialize/c/serialize/common.h
similarity index 100%
rename from level_0/f_serialize/c/serialize-common.h
rename to level_0/f_serialize/c/serialize/common.h

diff --git a/level_0/f_serialize/data/build/settings b/level_0/f_serialize/data/build/settings
index 3b0a081e92af5c07b687a2d475c83e2efb86ee6f..74fbbea8d19ba1bab3bd3f62d2a36ff6db2b3997 100644 (file)
--- a/level_0/f_serialize/data/build/settings
+++ b/level_0/f_serialize/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library serialize.c serialize-common.c private-serialize.c
+build_sources_library serialize.c private-serialize.c serialize/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers serialize.h serialize-common.h
+build_sources_headers serialize.h serialize/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_signal/c/signal.h b/level_0/f_signal/c/signal.h
index 5e2d9985a3397393df9177fba61e67bed5fe0263..b7369987b6972d5f091a44372e0efa7274d07079 100644 (file)
--- a/level_0/f_signal/c/signal.h
+++ b/level_0/f_signal/c/signal.h
@@ -21,8 +21,8 @@
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 
-// fll-0 signal includes
-#include <fll/level_0/signal-common.h>
+// FLL-0 signal includes.
+#include <fll/level_0/signal/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_signal/c/signal-common.h b/level_0/f_signal/c/signal/common.h
similarity index 100%
rename from level_0/f_signal/c/signal-common.h
rename to level_0/f_signal/c/signal/common.h

diff --git a/level_0/f_signal/data/build/settings b/level_0/f_signal/data/build/settings
index a45d8fe03f240afa9d2b6350805e6e8fd9746bdd..a04ea20ea96e091292c1b2fbd1107ccb1fd9dd08 100644 (file)
--- a/level_0/f_signal/data/build/settings
+++ b/level_0/f_signal/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers signal.h signal-common.h
+build_sources_headers signal.h signal/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_socket/c/socket.h b/level_0/f_socket/c/socket.h
index 85409fdf326396bc8fc42e032c229d1a8c096eff..80ca69eb7e31f3056c8e6519797a980fda20a9a3 100644 (file)
--- a/level_0/f_socket/c/socket.h
+++ b/level_0/f_socket/c/socket.h
@@ -25,8 +25,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 socket includes
-#include <fll/level_0/socket-common.h>
+// FLL-0 socket includes.
+#include <fll/level_0/socket/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_socket/c/socket-common.h b/level_0/f_socket/c/socket/common.h
similarity index 100%
rename from level_0/f_socket/c/socket-common.h
rename to level_0/f_socket/c/socket/common.h

diff --git a/level_0/f_socket/data/build/settings b/level_0/f_socket/data/build/settings
index f8cd04c075b3ab81d07238803d2406f4b06190ad..90f4dfee2df76832e83e72b6469c26b57a73ddc1 100644 (file)
--- a/level_0/f_socket/data/build/settings
+++ b/level_0/f_socket/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers socket.h socket-common.h
+build_sources_headers socket.h socket/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_status/data/build/settings b/level_0/f_status/data/build/settings
index 493c51ea0c9a11927e17ad502e6316106151c5c2..a57bf31d15789a0e5fed09d508439630c043da85 100644 (file)
--- a/level_0/f_status/data/build/settings
+++ b/level_0/f_status/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_status_string/data/build/settings b/level_0/f_status_string/data/build/settings
index f8a3236464bc1d7cad07d04fe9df0b53e204e450..aaad9ce8c4ecc031a089baaaa1f4f8a2320dc5f6 100644 (file)
--- a/level_0/f_status_string/data/build/settings
+++ b/level_0/f_status_string/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_string/c/string.h b/level_0/f_string/c/string.h
index 5bd4d0ab77b9ce402ac5c4ae3777b047d825dcc4..c72e44da867809dcacf2bf124cfdf91b9b8bf609 100644 (file)
--- a/level_0/f_string/c/string.h
+++ b/level_0/f_string/c/string.h
@@ -21,13 +21,13 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/type.h>
 
-// fll-0 string includes
-#include <fll/level_0/string-common.h>
-#include <fll/level_0/string_dynamic.h>
-#include <fll/level_0/string_map.h>
-#include <fll/level_0/string_quantity.h>
-#include <fll/level_0/string_range.h>
-#include <fll/level_0/string_triple.h>
+// FLL-0 string includes.
+#include <fll/level_0/string/common.h>
+#include <fll/level_0/string/range.h>
+#include <fll/level_0/string/dynamic.h>
+#include <fll/level_0/string/map.h>
+#include <fll/level_0/string/quantity.h>
+#include <fll/level_0/string/triple.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string-common.c b/level_0/f_string/c/string/common.c
similarity index 78%
rename from level_0/f_string/c/string-common.c
rename to level_0/f_string/c/string/common.c
index f1f1b2edd38f7e2ee37e3da58d2c23b2e1b35f2e..71f488d2600e37f35c50807e64c7087d3c6cc670 100644 (file)
--- a/level_0/f_string/c/string-common.c
+++ b/level_0/f_string/c/string/common.c
@@ -1,5 +1,4 @@
 #include "string.h"
-#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string-common.h b/level_0/f_string/c/string/common.h
similarity index 100%
rename from level_0/f_string/c/string-common.h
rename to level_0/f_string/c/string/common.h

diff --git a/level_0/f_string/c/string_dynamic.c b/level_0/f_string/c/string/dynamic.c
similarity index 99%
rename from level_0/f_string/c/string_dynamic.c
rename to level_0/f_string/c/string/dynamic.c
index 8578ecfdd57efb41e93b531e73cfeceb6d416d5f..b6aeb66eaacf6785907cdc5b0330bf77f6fd0e53 100644 (file)
--- a/level_0/f_string/c/string_dynamic.c
+++ b/level_0/f_string/c/string/dynamic.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_dynamic.h b/level_0/f_string/c/string/dynamic.h
similarity index 99%
rename from level_0/f_string/c/string_dynamic.h
rename to level_0/f_string/c/string/dynamic.h
index cf56e8d56aceb34b226285483b6e2ca252fdd01d..613710353393b424b966e4448fbecd096d840f94 100644 (file)
--- a/level_0/f_string/c/string_dynamic.h
+++ b/level_0/f_string/c/string/dynamic.h
@@ -16,9 +16,6 @@
 extern "C" {
 #endif
 
-// fll-0 string includes
-#include <fll/level_0/string_range.h>
-
 /**
  * A string that is analogous to f_string_dynamic_t but intended for static-only uses.
  *

diff --git a/level_0/f_string/c/string_map.c b/level_0/f_string/c/string/map.c
similarity index 99%
rename from level_0/f_string/c/string_map.c
rename to level_0/f_string/c/string/map.c
index 8e7f0cdd6c2bb23310e828bf376bedea6d21f25e..1aac93b2c114a674b2aed4394e9f2006e63161df 100644 (file)
--- a/level_0/f_string/c/string_map.c
+++ b/level_0/f_string/c/string/map.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_map.h b/level_0/f_string/c/string/map.h
similarity index 100%
rename from level_0/f_string/c/string_map.h
rename to level_0/f_string/c/string/map.h

diff --git a/level_0/f_string/c/string_quantity.c b/level_0/f_string/c/string/quantity.c
similarity index 99%
rename from level_0/f_string/c/string_quantity.c
rename to level_0/f_string/c/string/quantity.c
index 00d33813dd0b211a939dd165680ddb4e967a4938..8bd193ee9ae6a3b7ee08a23accf964afbd4c81f0 100644 (file)
--- a/level_0/f_string/c/string_quantity.c
+++ b/level_0/f_string/c/string/quantity.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_quantity.h b/level_0/f_string/c/string/quantity.h
similarity index 100%
rename from level_0/f_string/c/string_quantity.h
rename to level_0/f_string/c/string/quantity.h

diff --git a/level_0/f_string/c/string_range.c b/level_0/f_string/c/string/range.c
similarity index 99%
rename from level_0/f_string/c/string_range.c
rename to level_0/f_string/c/string/range.c
index 7aaa09e2dc1156a4babb109fb4740de5da75ab29..0cb06c9ec8035830851215aaa9dbdbc6b44f507e 100644 (file)
--- a/level_0/f_string/c/string_range.c
+++ b/level_0/f_string/c/string/range.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_range.h b/level_0/f_string/c/string/range.h
similarity index 100%
rename from level_0/f_string/c/string_range.h
rename to level_0/f_string/c/string/range.h

diff --git a/level_0/f_string/c/string_triple.c b/level_0/f_string/c/string/triple.c
similarity index 98%
rename from level_0/f_string/c/string_triple.c
rename to level_0/f_string/c/string/triple.c
index cbde60c427608e911438794ac2b5cb19bb7410f3..056d7779d274c197dc538468bdf9dc6e8a32478f 100644 (file)
--- a/level_0/f_string/c/string_triple.c
+++ b/level_0/f_string/c/string/triple.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_triple.h b/level_0/f_string/c/string/triple.h
similarity index 100%
rename from level_0/f_string/c/string_triple.h
rename to level_0/f_string/c/string/triple.h

diff --git a/level_0/f_string/data/build/settings b/level_0/f_string/data/build/settings
index cf3c5a1f5ec6d7d07a670e05183e078a3ac72baa..53bbd2a31436e148f8b4eb16a73e8d62c73b3a06 100644 (file)
--- a/level_0/f_string/data/build/settings
+++ b/level_0/f_string/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library string.c string-common.c private-string.c string_dynamic.c string_map.c string_quantity.c string_range.c string_triple.c
+build_sources_library string.c private-string.c string/common.c string/dynamic.c string/map.c string/quantity.c string/range.c string/triple.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers string.h string-common.h string_dynamic.h string_map.h string_quantity.h string_range.h string_triple.h
+build_sources_headers string.h string/common.h string/dynamic.h string/map.h string/quantity.h string/range.h string/triple.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_thread/c/thread.h b/level_0/f_thread/c/thread.h
index d2ebd44fdffb4954d9d473d6a58b910751258fe2..b81901c844cc3b06838d663cf5126bc43167b214 100644 (file)
--- a/level_0/f_thread/c/thread.h
+++ b/level_0/f_thread/c/thread.h
@@ -10,7 +10,7 @@
 #ifndef _F_thread_h
 #define _F_thread_h
 
-// include pre-requirements
+// Include pre-requirements.
 #define _GNU_SOURCE
 
 // Libc includes.
@@ -28,8 +28,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 thread includes
-#include <fll/level_0/thread-common.h>
+// FLL-0 thread includes.
+#include <fll/level_0/thread/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_thread/c/thread-common.h b/level_0/f_thread/c/thread/common.h
similarity index 100%
rename from level_0/f_thread/c/thread-common.h
rename to level_0/f_thread/c/thread/common.h

diff --git a/level_0/f_thread/data/build/settings b/level_0/f_thread/data/build/settings
index eb59aa7156a5de6d5582f5fc3d30b5d87ecf2aa6..14676dd3849ebc38e643b2ad9accd104a84d9c89 100644 (file)
--- a/level_0/f_thread/data/build/settings
+++ b/level_0/f_thread/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers thread.h thread-common.h
+build_sources_headers thread.h thread/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_type/data/build/settings b/level_0/f_type/data/build/settings
index 68630d0492e308d4ed535b47019e7e0d668257e6..59bf53331c03fca4cd8c51c88b810d2cc3740adb 100644 (file)
--- a/level_0/f_type/data/build/settings
+++ b/level_0/f_type/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_type_array/c/type_array.h b/level_0/f_type_array/c/type_array.h
index eb2c807a79b24f43f19eba099497f628c948a737..401bb7dc6a3ca7c372f88d7ceefd550034ac63da 100644 (file)
--- a/level_0/f_type_array/c/type_array.h
+++ b/level_0/f_type_array/c/type_array.h
@@ -18,7 +18,7 @@
 #include <fll/level_0/memory.h>
 
 // FLL-0 type_array includes.
-#include <fll/level_0/type_array-common.h>
+#include <fll/level_0/type_array/common.h>
 #include <fll/level_0/type_array/array_length.h>
 #include <fll/level_0/type_array/cell.h>
 #include <fll/level_0/type_array/fll_id.h>

diff --git a/level_0/f_type_array/c/type_array-common.h b/level_0/f_type_array/c/type_array/common.h
similarity index 100%
rename from level_0/f_type_array/c/type_array-common.h
rename to level_0/f_type_array/c/type_array/common.h

diff --git a/level_0/f_type_array/data/build/settings b/level_0/f_type_array/data/build/settings
index 1378a2b513211cfbd5e605f02d8a5138310930a4..c765305c24b772f333a7360bfde7eda7d87e1dc0 100644 (file)
--- a/level_0/f_type_array/data/build/settings
+++ b/level_0/f_type_array/data/build/settings
@@ -40,8 +40,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers type_array.h type_array-common.h
-build_sources_headers type_array/array_length.h type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/state.h type_array/status.h
+build_sources_headers type_array.h type_array/common.h type_array/array_length.h type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/state.h type_array/status.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_utf/c/utf.c b/level_0/f_utf/c/utf.c
index de435cd7cd9c7739f5618d25491142722f671a6a..e3a26c6987a9b3f820d16c637bd9d4d8f35c6654 100644 (file)
--- a/level_0/f_utf/c/utf.c
+++ b/level_0/f_utf/c/utf.c
@@ -1,6 +1,6 @@
 #include "utf.h"
 #include "private-utf.h"
-#include "private-utf-is_unassigned.h"
+#include "utf/private-is_unassigned.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h
index a550bd5131424f519df3dfc67dbac7748187c2c6..4aa57ee70af47d6f2c2090b59b5372617f4b125a 100644 (file)
--- a/level_0/f_utf/c/utf.h
+++ b/level_0/f_utf/c/utf.h
@@ -48,11 +48,11 @@
 #include <fll/level_0/string.h>
 
 // FLL-0 utf includes.
-#include <fll/level_0/utf-common.h>
-#include <fll/level_0/utf_dynamic.h>
-#include <fll/level_0/utf_map.h>
-#include <fll/level_0/utf_string.h>
-#include <fll/level_0/utf_triple.h>
+#include <fll/level_0/utf/common.h>
+#include <fll/level_0/utf/dynamic.h>
+#include <fll/level_0/utf/map.h>
+#include <fll/level_0/utf/string.h>
+#include <fll/level_0/utf/triple.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf-common.c b/level_0/f_utf/c/utf/common.c
similarity index 97%
rename from level_0/f_utf/c/utf-common.c
rename to level_0/f_utf/c/utf/common.c
index 8fb6b89be84d85460b95862786b4435989c898bb..d59ca7bd7f813231f134a157885bb147fab8d670 100644 (file)
--- a/level_0/f_utf/c/utf-common.c
+++ b/level_0/f_utf/c/utf/common.c
@@ -1,6 +1,4 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf-common.h b/level_0/f_utf/c/utf/common.h
similarity index 100%
rename from level_0/f_utf/c/utf-common.h
rename to level_0/f_utf/c/utf/common.h

diff --git a/level_0/f_utf/c/utf_dynamic.c b/level_0/f_utf/c/utf/dynamic.c
similarity index 99%
rename from level_0/f_utf/c/utf_dynamic.c
rename to level_0/f_utf/c/utf/dynamic.c
index c2880189fdf53c2a12a1b72dd50f97d68252068c..672fe3fc899e677ed7ed19b24c1f089a2857e1db 100644 (file)
--- a/level_0/f_utf/c/utf_dynamic.c
+++ b/level_0/f_utf/c/utf/dynamic.c
@@ -1,6 +1,6 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "../private-utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf_dynamic.h b/level_0/f_utf/c/utf/dynamic.h
similarity index 100%
rename from level_0/f_utf/c/utf_dynamic.h
rename to level_0/f_utf/c/utf/dynamic.h

diff --git a/level_0/f_utf/c/utf_map.c b/level_0/f_utf/c/utf/map.c
similarity index 99%
rename from level_0/f_utf/c/utf_map.c
rename to level_0/f_utf/c/utf/map.c
index 429a79c88d319a9fad9599f2abe53047f11dc10d..16bc6d87af227f8d370ba97d53fca27fd83685b9 100644 (file)
--- a/level_0/f_utf/c/utf_map.c
+++ b/level_0/f_utf/c/utf/map.c
@@ -1,6 +1,6 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "../private-utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf_map.h b/level_0/f_utf/c/utf/map.h
similarity index 100%
rename from level_0/f_utf/c/utf_map.h
rename to level_0/f_utf/c/utf/map.h

diff --git a/level_0/f_utf/c/private-utf-is_unassigned.c b/level_0/f_utf/c/utf/private-is_unassigned.c
similarity index 99%
rename from level_0/f_utf/c/private-utf-is_unassigned.c
rename to level_0/f_utf/c/utf/private-is_unassigned.c
index 9548bcc63e985df18638af3705a7ffb38fa2f419..e84a2fb433c51fd81000a2c8d7f5acb41f59e3d5 100644 (file)
--- a/level_0/f_utf/c/private-utf-is_unassigned.c
+++ b/level_0/f_utf/c/utf/private-is_unassigned.c
@@ -1,6 +1,6 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf-is_unassigned.h"
+#include "../utf.h"
+#include "../private-utf.h"
+#include "private-is_unassigned.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/private-utf-is_unassigned.h b/level_0/f_utf/c/utf/private-is_unassigned.h
similarity index 100%
rename from level_0/f_utf/c/private-utf-is_unassigned.h
rename to level_0/f_utf/c/utf/private-is_unassigned.h

diff --git a/level_0/f_utf/c/private-utf_string.c b/level_0/f_utf/c/utf/private-string.c
similarity index 99%
rename from level_0/f_utf/c/private-utf_string.c
rename to level_0/f_utf/c/utf/private-string.c
index e60111634f8310bb344d43591b8b65ec2f228fb9..7cf38a44a7bd073b9d53b7c00898dadd2fd2b826 100644 (file)
--- a/level_0/f_utf/c/private-utf_string.c
+++ b/level_0/f_utf/c/utf/private-string.c
@@ -1,5 +1,5 @@
-#include "utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/private-utf_string.h b/level_0/f_utf/c/utf/private-string.h
similarity index 100%
rename from level_0/f_utf/c/private-utf_string.h
rename to level_0/f_utf/c/utf/private-string.h

diff --git a/level_0/f_utf/c/utf_string.c b/level_0/f_utf/c/utf/string.c
similarity index 99%
rename from level_0/f_utf/c/utf_string.c
rename to level_0/f_utf/c/utf/string.c
index 7011fe22a1b570c1cd584b4a566ceb511fc40291..a3fc569f74d2491b34ba561c9550d35ff3b939f2 100644 (file)
--- a/level_0/f_utf/c/utf_string.c
+++ b/level_0/f_utf/c/utf/string.c
@@ -1,6 +1,5 @@
-#include "utf.h"
-#include "utf_string.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf_string.h b/level_0/f_utf/c/utf/string.h
similarity index 100%
rename from level_0/f_utf/c/utf_string.h
rename to level_0/f_utf/c/utf/string.h

diff --git a/level_0/f_utf/c/utf_triple.c b/level_0/f_utf/c/utf/triple.c
similarity index 98%
rename from level_0/f_utf/c/utf_triple.c
rename to level_0/f_utf/c/utf/triple.c
index 8ae6ae0ec742c6df728670af56776fdb50ce0a06..88fa935f0abf1b98364574b006b1c52fdcc2355e 100644 (file)
--- a/level_0/f_utf/c/utf_triple.c
+++ b/level_0/f_utf/c/utf/triple.c
@@ -1,6 +1,6 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "../private-utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf_triple.h b/level_0/f_utf/c/utf/triple.h
similarity index 100%
rename from level_0/f_utf/c/utf_triple.h
rename to level_0/f_utf/c/utf/triple.h

diff --git a/level_0/f_utf/data/build/settings b/level_0/f_utf/data/build/settings
index b7d6548affada469e476f94867b750be070f41c5..bf441657ddcc1ed2268cffa69e5f6a48af78b208 100644 (file)
--- a/level_0/f_utf/data/build/settings
+++ b/level_0/f_utf/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library utf.c utf-common.c utf_dynamic.c utf_map.c utf_string.c utf_triple.c private-utf.c private-utf-is_unassigned.c private-utf_string.c
+build_sources_library utf.c private-utf.c utf/common.c utf/dynamic.c utf/map.c utf/private-is_unassigned.c utf/private-string.c utf/string.c utf/triple.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers utf.h utf-common.h utf_dynamic.h utf_map.h utf_string.h utf_triple.h
+build_sources_headers utf.h utf/common.h utf/dynamic.h utf/map.h utf/string.h utf/triple.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_control_group/data/build/settings b/level_1/fl_control_group/data/build/settings
index c3ff85c3a221cf20b5907d33990db79d70509be0..15b1e935cb3c357a8862e7ba1f675d803e15aaee 100644 (file)
--- a/level_1/fl_control_group/data/build/settings
+++ b/level_1/fl_control_group/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_conversion/data/build/settings b/level_1/fl_conversion/data/build/settings
index 0652e5992827271e3e8cb0ae091db63df7bbb9ee..e385ecf03e6ad2831068272f33a25cf77b2c0f6f 100644 (file)
--- a/level_1/fl_conversion/data/build/settings
+++ b/level_1/fl_conversion/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_directory/c/directory.h b/level_1/fl_directory/c/directory.h
index b904ce71bfa73719deefb8b9f8ad7cb412739a21..8515ebf6209fa7daf44018a126383a2598803758 100644 (file)
--- a/level_1/fl_directory/c/directory.h
+++ b/level_1/fl_directory/c/directory.h
@@ -41,7 +41,7 @@
 #include <fll/level_0/path.h>
 
 // FLL-1 directory includes.
-#include <fll/level_1/directory-common.h>
+#include <fll/level_1/directory/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_directory/c/directory-common.c b/level_1/fl_directory/c/directory/common.c
similarity index 77%
rename from level_1/fl_directory/c/directory-common.c
rename to level_1/fl_directory/c/directory/common.c
index 2f595c43bfa7be1cc12cbd1dd71d3903c7b5c82e..289532bf7c469c2a14e00d605cdc8aa8c0a6b8f3 100644 (file)
--- a/level_1/fl_directory/c/directory-common.c
+++ b/level_1/fl_directory/c/directory/common.c
@@ -1,5 +1,4 @@
 #include "directory.h"
-#include "private-directory.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_directory/c/directory-common.h b/level_1/fl_directory/c/directory/common.h
similarity index 100%
rename from level_1/fl_directory/c/directory-common.h
rename to level_1/fl_directory/c/directory/common.h

diff --git a/level_1/fl_directory/data/build/settings b/level_1/fl_directory/data/build/settings
index 9bcf591aa779e2546c16a886a242ac13c6afcbbd..979a23b6e4b335a4c919b02285ad53a57cbe3b35 100644 (file)
--- a/level_1/fl_directory/data/build/settings
+++ b/level_1/fl_directory/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers directory.h directory-common.h
+build_sources_headers directory.h directory/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_environment/data/build/settings b/level_1/fl_environment/data/build/settings
index 9d39bc94cf775a15a107197b90a67e2e244d0758..71a63af6801039a0bad4a2116ce2581921c84b0d 100644 (file)
--- a/level_1/fl_environment/data/build/settings
+++ b/level_1/fl_environment/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_execute/c/execute.h b/level_1/fl_execute/c/execute.h
index ccbbaf94d62923b67c45a77c4e13f8de89e4cb23..bcb00946d1c6fc61286a936ee4aeb94e8b7a374e 100644 (file)
--- a/level_1/fl_execute/c/execute.h
+++ b/level_1/fl_execute/c/execute.h
@@ -30,8 +30,8 @@
 #include <fll/level_0/limit.h>
 #include <fll/level_0/signal.h>
 
-// fll-1 execute includes
-#include <fll/level_1/execute-common.h>
+// FLL-1 execute includes.
+#include <fll/level_1/execute/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_execute/c/execute-common.h b/level_1/fl_execute/c/execute/common.h
similarity index 100%
rename from level_1/fl_execute/c/execute-common.h
rename to level_1/fl_execute/c/execute/common.h

diff --git a/level_1/fl_execute/data/build/settings b/level_1/fl_execute/data/build/settings
index f36757000b986e44385e7d3272ce33e4fe789ff5..933f61ca3a4899f91cdef0abbe21c57e47fc63c4 100644 (file)
--- a/level_1/fl_execute/data/build/settings
+++ b/level_1/fl_execute/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers execute.h execute-common.h
+build_sources_headers execute.h execute/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_fss/c/fss_basic.c b/level_1/fl_fss/c/fss/basic.c
similarity index 98%
rename from level_1/fl_fss/c/fss_basic.c
rename to level_1/fl_fss/c/fss/basic.c
index 447d9bf3690a9839a5388a70483d89d4c2008ec0..5c92c52309d3ce0444a51d24ec9b5dd5dad71e98 100644 (file)
--- a/level_1/fl_fss/c/fss_basic.c
+++ b/level_1/fl_fss/c/fss/basic.c
@@ -1,6 +1,6 @@
-#include "fss_basic.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "basic.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_basic.h b/level_1/fl_fss/c/fss/basic.h
similarity index 100%
rename from level_1/fl_fss/c/fss_basic.h
rename to level_1/fl_fss/c/fss/basic.h

diff --git a/level_1/fl_fss/c/fss_basic_list.c b/level_1/fl_fss/c/fss/basic_list.c
similarity index 99%
rename from level_1/fl_fss/c/fss_basic_list.c
rename to level_1/fl_fss/c/fss/basic_list.c
index 5e7e3a2b2be82005de7e4aab2a5ef2a3aaf0b6ba..757b95e99478e7a289802501a16fc955a9b01f02 100644 (file)
--- a/level_1/fl_fss/c/fss_basic_list.c
+++ b/level_1/fl_fss/c/fss/basic_list.c
@@ -1,6 +1,6 @@
-#include "fss_basic.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "basic_list.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_basic_list.h b/level_1/fl_fss/c/fss/basic_list.h
similarity index 99%
rename from level_1/fl_fss/c/fss_basic_list.h
rename to level_1/fl_fss/c/fss/basic_list.h
index 8e92ca151b6d0fd7403f197d93ebfd93d7302897..b5beef88e35aaecafe1096631d55af25445f3af0 100644 (file)
--- a/level_1/fl_fss/c/fss_basic_list.h
+++ b/level_1/fl_fss/c/fss/basic_list.h
@@ -15,7 +15,6 @@
 #include <string.h>
 
 // FLL-0 includes.
-
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
@@ -25,7 +24,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_embedded_list.c b/level_1/fl_fss/c/fss/embedded_list.c
similarity index 99%
rename from level_1/fl_fss/c/fss_embedded_list.c
rename to level_1/fl_fss/c/fss/embedded_list.c
index c24f63f963ed5b927586a68a7e53966ff0979d44..172f23d4c96ae8b15bfa3f04cbbf01841bc820d3 100644 (file)
--- a/level_1/fl_fss/c/fss_embedded_list.c
+++ b/level_1/fl_fss/c/fss/embedded_list.c
@@ -1,6 +1,6 @@
-#include "fss_embedded_list.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "embedded_list.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_embedded_list.h b/level_1/fl_fss/c/fss/embedded_list.h
similarity index 99%
rename from level_1/fl_fss/c/fss_embedded_list.h
rename to level_1/fl_fss/c/fss/embedded_list.h
index e3801092a43bb640118801e70a231c1cc075aadd..1713d493e69143eef4b27159e0abb7c312aac59b 100644 (file)
--- a/level_1/fl_fss/c/fss_embedded_list.h
+++ b/level_1/fl_fss/c/fss/embedded_list.h
@@ -15,7 +15,6 @@
 #include <string.h>
 
 // FLL-0 includes.
-
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
@@ -25,7 +24,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_extended.c b/level_1/fl_fss/c/fss/extended.c
similarity index 99%
rename from level_1/fl_fss/c/fss_extended.c
rename to level_1/fl_fss/c/fss/extended.c
index 29a056417ef7f466264e875ba42b862fe15a6cf7..f0425f147e7676b3a2e11839af5db9569344f6d5 100644 (file)
--- a/level_1/fl_fss/c/fss_extended.c
+++ b/level_1/fl_fss/c/fss/extended.c
@@ -1,6 +1,6 @@
-#include "fss_extended.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "extended.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_extended.h b/level_1/fl_fss/c/fss/extended.h
similarity index 99%
rename from level_1/fl_fss/c/fss_extended.h
rename to level_1/fl_fss/c/fss/extended.h
index 67d56704fc77b063a896d41ce0e9901fe9da0214..d26b617d2486f6939c62f6cdb9d90727c74bceab 100644 (file)
--- a/level_1/fl_fss/c/fss_extended.h
+++ b/level_1/fl_fss/c/fss/extended.h
@@ -15,7 +15,6 @@
 #include <string.h>
 
 // FLL-0 includes.
-
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>

diff --git a/level_1/fl_fss/c/fss_extended_list.c b/level_1/fl_fss/c/fss/extended_list.c
similarity index 99%
rename from level_1/fl_fss/c/fss_extended_list.c
rename to level_1/fl_fss/c/fss/extended_list.c
index eee94f6bde6d522f4e200c541c7d71f172fb7bf4..c56aa5bc2ccce8ec9da19fda70a894340b03e076 100644 (file)
--- a/level_1/fl_fss/c/fss_extended_list.c
+++ b/level_1/fl_fss/c/fss/extended_list.c
@@ -1,6 +1,6 @@
-#include "fss_extended_list.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "extended_list.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_extended_list.h b/level_1/fl_fss/c/fss/extended_list.h
similarity index 99%
rename from level_1/fl_fss/c/fss_extended_list.h
rename to level_1/fl_fss/c/fss/extended_list.h
index 6c7b04349acd66c3794a893bab15deebd9aab1ae..3ba5b2ed41e3982fe66706f296f3c623c83ad020 100644 (file)
--- a/level_1/fl_fss/c/fss_extended_list.h
+++ b/level_1/fl_fss/c/fss/extended_list.h
@@ -15,7 +15,6 @@
 #include <string.h>
 
 // FLL-0 includes.
-
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
@@ -25,7 +24,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/private-fss_macro.h b/level_1/fl_fss/c/fss/macro.h
similarity index 100%
rename from level_1/fl_fss/c/private-fss_macro.h
rename to level_1/fl_fss/c/fss/macro.h

diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c
index 929c9e5084ab2900ac6f5388f04f40809f08efaa..5d2ab168ace6aa76d0875993cae4feaa019a815f 100644 (file)
--- a/level_1/fl_fss/c/private-fss.c
+++ b/level_1/fl_fss/c/private-fss.c
@@ -1,6 +1,6 @@
 #include "fss.h"
 #include "private-fss.h"
-#include "private-fss_macro.h"
+#include "fss/macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings
index ae66169ddb99b69ef41227105763cd6dbe69d47f..52a8732c09882c1d7da04ac489da58734a18cb84 100644 (file)
--- a/level_1/fl_fss/data/build/settings
+++ b/level_1/fl_fss/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c
+build_sources_library private-fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h
+build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_iki/data/build/settings b/level_1/fl_iki/data/build/settings
index 0df87de5a687141b64af6d9098a82e41b3a5f726..1f848c078ad029555d113a80f9e12c51c18b524a 100644 (file)
--- a/level_1/fl_iki/data/build/settings
+++ b/level_1/fl_iki/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_print/c/print.h b/level_1/fl_print/c/print.h
index 8af1047dd632bed93073ad58c2fd18be53d369d4..6b50645e63e32119ab6d30bbcf80e7d43a7af62e 100644 (file)
--- a/level_1/fl_print/c/print.h
+++ b/level_1/fl_print/c/print.h
@@ -26,8 +26,8 @@
 #include <fll/level_0/file.h>
 #include <fll/level_0/print.h>
 
-// fll-1 print includes.
-#include <fll/level_1/print-common.h>
+// FLL-1 print includes.
+#include <fll/level_1/print/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_print/c/print-common.c b/level_1/fl_print/c/print/common.c
similarity index 91%
rename from level_1/fl_print/c/print-common.c
rename to level_1/fl_print/c/print/common.c
index 1cc329ba7121d4e6a7a542e223aa0c66811b71de..4807ed8d4fef80c00192f3d8c271921e931960a6 100644 (file)
--- a/level_1/fl_print/c/print-common.c
+++ b/level_1/fl_print/c/print/common.c
@@ -1,5 +1,4 @@
-#include "print.h"
-#include "private-print.h"
+#include "../print.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_print/c/print-common.h b/level_1/fl_print/c/print/common.h
similarity index 100%
rename from level_1/fl_print/c/print-common.h
rename to level_1/fl_print/c/print/common.h

diff --git a/level_1/fl_print/data/build/settings b/level_1/fl_print/data/build/settings
index e5bcbb54e7ee28b4a9813633c5174867125604d6..536ffd777d5b1213a9a327db509d94f659d2dd79 100644 (file)
--- a/level_1/fl_print/data/build/settings
+++ b/level_1/fl_print/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library print.c print-common.c private-print.c
+build_sources_library print.c private-print.c print/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers print.h print-common.h
+build_sources_headers print.h print/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_signal/c/signal.h b/level_1/fl_signal/c/signal.h
index 65123f5edbd0fa63bdcff28f2659cb52b1de7a43..821dbb81b70991b9ea0664047f02f25c781c3f67 100644 (file)
--- a/level_1/fl_signal/c/signal.h
+++ b/level_1/fl_signal/c/signal.h
@@ -20,8 +20,8 @@
 #include <fll/level_0/status.h>
 #include <fll/level_0/signal.h>
 
-// fll-1 signal includes
-#include <fll/level_1/signal-common.h>
+// FLL-1 signal includes.
+#include <fll/level_1/signal/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_signal/c/signal-common.h b/level_1/fl_signal/c/signal/common.h
similarity index 100%
rename from level_1/fl_signal/c/signal-common.h
rename to level_1/fl_signal/c/signal/common.h

diff --git a/level_1/fl_signal/data/build/settings b/level_1/fl_signal/data/build/settings
index 4ae316e774331f26e259b930ce2bfc95b0f6a51b..46711af20a344b98b9563afc65c51c8e94a02310 100644 (file)
--- a/level_1/fl_signal/data/build/settings
+++ b/level_1/fl_signal/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers signal.h signal-common.h
+build_sources_headers signal.h signal/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_string/data/build/settings b/level_1/fl_string/data/build/settings
index 6cf487ce829c723b64f08832b558f6a499392832..5c6ba8af3eeb1b9ab4dcd815f291a02e4fab7b5f 100644 (file)
--- a/level_1/fl_string/data/build/settings
+++ b/level_1/fl_string/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_utf/data/build/settings b/level_1/fl_utf/data/build/settings
index 580776663ec425d9b2043b47f0af211ae3f22542..8a357d7b78603e612f5f4c6b9f4cfa51c33036aa 100644 (file)
--- a/level_1/fl_utf/data/build/settings
+++ b/level_1/fl_utf/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_utf_file/data/build/settings b/level_1/fl_utf_file/data/build/settings
index 3585cedbcc4958e59fb6be740eaf87152d4161e5..9bf466fc90aaaf4ec1cfe9a57c26005c9bedae9d 100644 (file)
--- a/level_1/fl_utf_file/data/build/settings
+++ b/level_1/fl_utf_file/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_control_group/data/build/settings b/level_2/fll_control_group/data/build/settings
index a7823fecdad4c2a31b5e944accb1970e97329306..0ea30e063cab872cceadd2dc62dd18bbd4974108 100644 (file)
--- a/level_2/fll_control_group/data/build/settings
+++ b/level_2/fll_control_group/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_error/c/error.h b/level_2/fll_error/c/error.h
index 5f74d510206f164070f8699463d3bc182d341bfa..4598da9032f00a63cfdcd2b5435d892d75fb5b64 100644 (file)
--- a/level_2/fll_error/c/error.h
+++ b/level_2/fll_error/c/error.h
@@ -27,8 +27,8 @@
 // FLL-1 includes.
 #include <fll/level_1/print.h>
 
-// fll-2 error includes
-#include <fll/level_2/error-common.h>
+// FLL-2 error includes.
+#include <fll/level_2/error/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_error/c/error-common.c b/level_2/fll_error/c/error/common.c
similarity index 95%
rename from level_2/fll_error/c/error-common.c
rename to level_2/fll_error/c/error/common.c
index 14735df22ff4071c166ce6c2ec6a2c50594ed9fe..e8691f23be74d98f8bff040a70be44c721f5ba7a 100644 (file)
--- a/level_2/fll_error/c/error-common.c
+++ b/level_2/fll_error/c/error/common.c
@@ -1,5 +1,4 @@
-#include "error.h"
-#include "private-error.h"
+#include "../error.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_error/c/error-common.h b/level_2/fll_error/c/error/common.h
similarity index 100%
rename from level_2/fll_error/c/error-common.h
rename to level_2/fll_error/c/error/common.h

diff --git a/level_2/fll_error/data/build/settings b/level_2/fll_error/data/build/settings
index 8bef3cd35c80d691ccac224c7353ae2d08b396bf..d4261dbe50f0eabba3e6bd507942e09aeab7b704 100644 (file)
--- a/level_2/fll_error/data/build/settings
+++ b/level_2/fll_error/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library error.c error-common.c private-error.c
+build_sources_library error.c private-error.c error/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers error.h error-common.h
+build_sources_headers error.h error/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings
index 86743d9c981ad3ee1cccac37a9c26c69818fab64..90c6a12923e862efb4b526a37150c5fc5937ddfd 100644 (file)
--- a/level_2/fll_execute/data/build/settings
+++ b/level_2/fll_execute/data/build/settings
@@ -63,7 +63,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_file/data/build/settings b/level_2/fll_file/data/build/settings
index 647b27ab5dcf066a02dbb3725126f6aa24f51ab3..c57e4fa4ccfb54e3d8b5487410332da456bdd833 100644 (file)
--- a/level_2/fll_file/data/build/settings
+++ b/level_2/fll_file/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_fss/c/fss.c b/level_2/fll_fss/c/fss.c
index b7740d864908a95da9ed38a8cd44bc0e1b975384..4e8d786eaa1f30abfb7f90f72f2a5b8f36edfcab 100644 (file)
--- a/level_2/fll_fss/c/fss.c
+++ b/level_2/fll_fss/c/fss.c
@@ -1,5 +1,4 @@
 #include "fss.h"
-#include "private-fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_basic.c b/level_2/fll_fss/c/fss/basic.c
similarity index 99%
rename from level_2/fll_fss/c/fss_basic.c
rename to level_2/fll_fss/c/fss/basic.c
index 18f98e94b9828dd06650a35abb616bd278eaa0f4..f967b53c0ea5bc54d82b56c41cf03312c327a3e1 100644 (file)
--- a/level_2/fll_fss/c/fss_basic.c
+++ b/level_2/fll_fss/c/fss/basic.c
@@ -1,4 +1,4 @@
-#include "fss_basic.h"
+#include "basic.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_basic.h b/level_2/fll_fss/c/fss/basic.h
similarity index 99%
rename from level_2/fll_fss/c/fss_basic.h
rename to level_2/fll_fss/c/fss/basic.h
index 89d3276ef6ad89f02543b7c72b81b19831d13953..7c70eef9ce650fe4644e38a7a4dbe7c4cf48f9c6 100644 (file)
--- a/level_2/fll_fss/c/fss_basic.h
+++ b/level_2/fll_fss/c/fss/basic.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 #include <fll/level_1/string.h>
 
 #ifdef __cplusplus

diff --git a/level_2/fll_fss/c/fss_basic_list.c b/level_2/fll_fss/c/fss/basic_list.c
similarity index 99%
rename from level_2/fll_fss/c/fss_basic_list.c
rename to level_2/fll_fss/c/fss/basic_list.c
index dee3c52a5da0458039006a088c4967b290a48796..bd3e501d398b567035088b905df44cc58ba3ee2c 100644 (file)
--- a/level_2/fll_fss/c/fss_basic_list.c
+++ b/level_2/fll_fss/c/fss/basic_list.c
@@ -1,4 +1,4 @@
-#include "fss_basic_list.h"
+#include "basic_list.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_basic_list.h b/level_2/fll_fss/c/fss/basic_list.h
similarity index 99%
rename from level_2/fll_fss/c/fss_basic_list.h
rename to level_2/fll_fss/c/fss/basic_list.h
index fe3bda0bdaa26c9caae69318ec24ff96dda096d4..75c64037e9922663a11f0e3256ae92d67ccd94ec 100644 (file)
--- a/level_2/fll_fss/c/fss_basic_list.h
+++ b/level_2/fll_fss/c/fss/basic_list.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic_list.h>
+#include <fll/level_1/fss/basic_list.h>
 #include <fll/level_1/string.h>
 
 #ifdef __cplusplus

diff --git a/level_2/fll_fss/c/fss_embedded_list.c b/level_2/fll_fss/c/fss/embedded_list.c
similarity index 99%
rename from level_2/fll_fss/c/fss_embedded_list.c
rename to level_2/fll_fss/c/fss/embedded_list.c
index d0721b36cc6465f38be5a1fd745b925837998969..908f7c580d09209736dafc7cd0bdb28a136100e5 100644 (file)
--- a/level_2/fll_fss/c/fss_embedded_list.c
+++ b/level_2/fll_fss/c/fss/embedded_list.c
@@ -1,4 +1,4 @@
-#include "fss_embedded_list.h"
+#include "embedded_list.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_embedded_list.h b/level_2/fll_fss/c/fss/embedded_list.h
similarity index 99%
rename from level_2/fll_fss/c/fss_embedded_list.h
rename to level_2/fll_fss/c/fss/embedded_list.h
index 554cc611172ee37db661fe4fa7da6836b0ddd7ae..c4823761e46e3d66b081eed0f89db7402be269d3 100644 (file)
--- a/level_2/fll_fss/c/fss_embedded_list.h
+++ b/level_2/fll_fss/c/fss/embedded_list.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_embedded_list.h>
+#include <fll/level_1/fss/embedded_list.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_extended.c b/level_2/fll_fss/c/fss/extended.c
similarity index 99%
rename from level_2/fll_fss/c/fss_extended.c
rename to level_2/fll_fss/c/fss/extended.c
index 36ad2800770cb2bea0f72e56fb8c2e2f5ba3c93d..c5c21779212e71bc7b5f9e17dd44c3257c21a3bd 100644 (file)
--- a/level_2/fll_fss/c/fss_extended.c
+++ b/level_2/fll_fss/c/fss/extended.c
@@ -1,4 +1,4 @@
-#include "fss_extended.h"
+#include "extended.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_extended.h b/level_2/fll_fss/c/fss/extended.h
similarity index 99%
rename from level_2/fll_fss/c/fss_extended.h
rename to level_2/fll_fss/c/fss/extended.h
index 2680bc727d31d8d7d23cea39101f96d6d00c7165..39393d7381ca9785f7e1b4df778b3b7ccba56b8e 100644 (file)
--- a/level_2/fll_fss/c/fss_extended.h
+++ b/level_2/fll_fss/c/fss/extended.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_extended.h>
+#include <fll/level_1/fss/extended.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_extended_list.c b/level_2/fll_fss/c/fss/extended_list.c
similarity index 99%
rename from level_2/fll_fss/c/fss_extended_list.c
rename to level_2/fll_fss/c/fss/extended_list.c
index 31427f99e196ee17bbad9202e9839b19edf53837..fb1fade38db5b61cd9101a0e2809cfd6c292441e 100644 (file)
--- a/level_2/fll_fss/c/fss_extended_list.c
+++ b/level_2/fll_fss/c/fss/extended_list.c
@@ -1,4 +1,4 @@
-#include "fss_extended_list.h"
+#include "extended_list.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_extended_list.h b/level_2/fll_fss/c/fss/extended_list.h
similarity index 99%
rename from level_2/fll_fss/c/fss_extended_list.h
rename to level_2/fll_fss/c/fss/extended_list.h
index 2fdda41f2e7891178c1cfaee0370c231fe35ee16..0871e900a9ed6861bd5b34e2d887a1592224271d 100644 (file)
--- a/level_2/fll_fss/c/fss_extended_list.h
+++ b/level_2/fll_fss/c/fss/extended_list.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_extended_list.h>
+#include <fll/level_1/fss/extended_list.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_payload.c b/level_2/fll_fss/c/fss/payload.c
similarity index 99%
rename from level_2/fll_fss/c/fss_payload.c
rename to level_2/fll_fss/c/fss/payload.c
index 67396186e57608f1ade86142298cccdf26ae779b..483990338aa53aeb3d973f1ff737834c7a56fa2b 100644 (file)
--- a/level_2/fll_fss/c/fss_payload.c
+++ b/level_2/fll_fss/c/fss/payload.c
@@ -1,4 +1,4 @@
-#include "fss_payload.h"
+#include "payload.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_payload.h b/level_2/fll_fss/c/fss/payload.h
similarity index 99%
rename from level_2/fll_fss/c/fss_payload.h
rename to level_2/fll_fss/c/fss/payload.h
index ba99f1b41d4e0cb478514b7a3151e5690d3acf63..a42982a899316149c0bef9378e4bd9ddae5e2ecf 100644 (file)
--- a/level_2/fll_fss/c/fss_payload.h
+++ b/level_2/fll_fss/c/fss/payload.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic_list.h>
+#include <fll/level_1/fss/basic_list.h>
 #include <fll/level_1/string.h>
 
 #ifdef __cplusplus

diff --git a/level_2/fll_fss/c/private-fss.c b/level_2/fll_fss/c/private-fss.c
deleted file mode 100644 (file)
index be126fd..0000000
--- a/level_2/fll_fss/c/private-fss.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "fss.h"
-#include "private-fss.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif

diff --git a/level_2/fll_fss/c/private-fss.h b/level_2/fll_fss/c/private-fss.h
deleted file mode 100644 (file)
index 749a068..0000000
--- a/level_2/fll_fss/c/private-fss.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * FLL - Level 2
- *
- * Project: FSS
- * API Version: 0.5
- * Licenses: lgpl-2.1-or-later
- *
- * These are provided for internal reduction in redundant code.
- * These should not be exposed/used outside of this project.
- */
-#ifndef _PRIVATE_FLL_fss_h
-#define _PRIVATE_FLL_fss_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif // _PRIVATE_FLL_fss_h

diff --git a/level_2/fll_fss/data/build/settings b/level_2/fll_fss/data/build/settings
index 60f0d007310db884c5ab9242581264f3ad994117..47647a9d3f44f7b3a0731f16db217c76049f548f 100644 (file)
--- a/level_2/fll_fss/data/build/settings
+++ b/level_2/fll_fss/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library fss.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c fss_payload.c
+build_sources_library fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c fss/payload.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_payload.h
+build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h fss/payload.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_fss_status_string/data/build/settings b/level_2/fll_fss_status_string/data/build/settings
index cc009504a8f189c1f3b6776d04fe064c3e473b39..dba7d348308c7bac605887080f776e81cb4ab1de 100644 (file)
--- a/level_2/fll_fss_status_string/data/build/settings
+++ b/level_2/fll_fss_status_string/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_iki/data/build/settings b/level_2/fll_iki/data/build/settings
index f8b3acbaac9d2aa2a0b9e2be6a126df5831ebe53..3e355a6e83c72cce6657d2e13c1c606e0c26e879 100644 (file)
--- a/level_2/fll_iki/data/build/settings
+++ b/level_2/fll_iki/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_path/data/build/settings b/level_2/fll_path/data/build/settings
index 08fe5a5829049ac628dd234507de87133f9dfc58..f05e6d2c8bd751515e1e324012db7146c9588281 100644 (file)
--- a/level_2/fll_path/data/build/settings
+++ b/level_2/fll_path/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_print/data/build/settings b/level_2/fll_print/data/build/settings
index 9c0d5f08e79922d7a10b06c15817f32bd9ffe30e..c1e28b7a493a510b98c8b3cc877b973fbbf6823b 100644 (file)
--- a/level_2/fll_print/data/build/settings
+++ b/level_2/fll_print/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_program/c/program.h b/level_2/fll_program/c/program.h
index fe5d14150ca90e5c80a7116ac80b72c248e6d6a5..de5ac41a174d9d2ee9eeb6d32d72951f229783bf 100644 (file)
--- a/level_2/fll_program/c/program.h
+++ b/level_2/fll_program/c/program.h
@@ -10,7 +10,7 @@
 #ifndef _FLL_program_h
 #define _FLL_program_h
 
-// libc include
+// Libc includes.
 #include <stdio.h>
 
 // FLL-0 includes.
@@ -29,8 +29,8 @@
 #include <fll/level_1/string.h>
 #include <fll/level_1/print.h>
 
-// fll-2 program includes
-#include <fll/level_2/program-common.h>
+// FLL-2 program includes.
+#include <fll/level_2/program/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_program/c/program-common.c b/level_2/fll_program/c/program/common.c
similarity index 98%
rename from level_2/fll_program/c/program-common.c
rename to level_2/fll_program/c/program/common.c
index c67b6db87ecd744831c67e1eb1ee53d769f68bd4..d3446d5b7c8afd1439c5d66adaed3746276f5447 100644 (file)
--- a/level_2/fll_program/c/program-common.c
+++ b/level_2/fll_program/c/program/common.c
@@ -1,4 +1,4 @@
-#include "program.h"
+#include "../program.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_program/c/program-common.h b/level_2/fll_program/c/program/common.h
similarity index 100%
rename from level_2/fll_program/c/program-common.h
rename to level_2/fll_program/c/program/common.h

diff --git a/level_2/fll_program/data/build/settings b/level_2/fll_program/data/build/settings
index 4b12fe3ddfd091cd0dfc45febaa19c0172d06521..765c65f7670d0c3c88c3bf95c7157e6da02f2e2d 100644 (file)
--- a/level_2/fll_program/data/build/settings
+++ b/level_2/fll_program/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library program.c program-common.c
+build_sources_library program.c program/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers program.h program-common.h
+build_sources_headers program.h program/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_status_string/data/build/settings b/level_2/fll_status_string/data/build/settings
index 3516ecfb5c958267b8ee36c729d0a0777cd20334..a538eb98bdb21cb86e7c117079d7041afe7ac633 100644 (file)
--- a/level_2/fll_status_string/data/build/settings
+++ b/level_2/fll_status_string/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings
index f04f44c2464fb8eb88a3fc0d137414b34ac69b2d..c3fbb7e54f21c413314950c82abfc71b6f54440f 100644 (file)
--- a/level_3/byte_dump/data/build/settings
+++ b/level_3/byte_dump/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/control/c/control.h b/level_3/control/c/control.h
index b3bc210c311d5071d271006d00d607435df75e48..1d193f0630dc1bfee1f9eaa502385813da0b6cae 100644 (file)
--- a/level_3/control/c/control.h
+++ b/level_3/control/c/control.h
@@ -40,7 +40,7 @@
 
 // FLL-2 includes.
 #include <fll/level_2/error.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/control/data/build/settings b/level_3/control/data/build/settings
index 427c53bdc093442eb0381b4c347cec6919bee64c..59af6ca418c245a0f6055bad69c7e4eeb2b0b112 100644 (file)
--- a/level_3/control/data/build/settings
+++ b/level_3/control/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/controller/c/controller.h b/level_3/controller/c/controller.h
index f41d8304c8987a42761398b7cb3fddde52b6a7a9..67f4c2ff017344c176da47155d7a2a23ceaee27f 100644 (file)
--- a/level_3/controller/c/controller.h
+++ b/level_3/controller/c/controller.h
@@ -74,10 +74,10 @@
 #include <fll/level_2/error.h>
 #include <fll/level_2/execute.h>
 #include <fll/level_2/fss.h>
-#include <fll/level_2/fss_basic_list.h>
-#include <fll/level_2/fss_extended.h>
-#include <fll/level_2/fss_extended_list.h>
-#include <fll/level_2/fss_payload.h>
+#include <fll/level_2/fss/basic_list.h>
+#include <fll/level_2/fss/extended.h>
+#include <fll/level_2/fss/extended_list.h>
+#include <fll/level_2/fss/payload.h>
 #include <fll/level_2/path.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>

diff --git a/level_3/controller/data/build/settings b/level_3/controller/data/build/settings
index 5bab4692fa639337b79472510059933c50571af8..1213f24e49e77c588bf433534d87d0b9bb2a178d 100644 (file)
--- a/level_3/controller/data/build/settings
+++ b/level_3/controller/data/build/settings
@@ -75,7 +75,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h
index da4ef731a699918bd058f2fb970db6fc2f3bb351..1ad83ae1d678ed5db365e90f2cc3f80d9d0f8d0c 100644 (file)
--- a/level_3/fake/c/fake.h
+++ b/level_3/fake/c/fake.h
@@ -82,8 +82,8 @@
 #include <fll/level_2/execute.h>
 #include <fll/level_2/file.h>
 #include <fll/level_2/fss.h>
-#include <fll/level_2/fss_basic_list.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/basic_list.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/path.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>

diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings
index b8413ab2480546b7bb1a50717042853c599e348f..56e6fffb6be32ae0a739082603d35c6008d6b012 100644 (file)
--- a/level_3/fake/data/build/settings
+++ b/level_3/fake/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h
index 6b0fbf6658f96153eb572f5b1bfd3a49415fbbf7..eeb1d9913e38a0f14ea0638d17e32bc27b44abf1 100644 (file)
--- a/level_3/firewall/c/firewall.h
+++ b/level_3/firewall/c/firewall.h
@@ -41,9 +41,9 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/execute.h>
-#include <fll/level_2/fss_basic.h>
-#include <fll/level_2/fss_basic_list.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/basic.h>
+#include <fll/level_2/fss/basic_list.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings
index 640df7b5b1f38117fe99b9b9d2c8657aa61c981a..e870e01248dd21ca327726b16e004cd623c828bd 100644 (file)
--- a/level_3/firewall/data/build/settings
+++ b/level_3/firewall/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
index 8c84b09a0bfd46e961d2a2d6787c9dcb6cfcfa6b..f7f9b4ad9fa30eb10b49bd749efa9e8c434ece2e 100644 (file)
--- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h
+++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_basic_list.h>
+#include <fll/level_2/fss/basic_list.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings
index b1afbde1d18ca3b11857672384a2b8100bbb1aae..354bfe2a483c9fde7e935bef08ab0644e75b3930 100644 (file)
--- a/level_3/fss_basic_list_read/data/build/settings
+++ b/level_3/fss_basic_list_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
index aae4f81c8ea4ab2c7bd6e63b8c4ee647ba4e52a9..fc725011e36dba2d54aa394b29360505467e6c93 100644 (file)
--- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h
+++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
@@ -30,7 +30,7 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/fss_basic_list.h>
+#include <fll/level_1/fss/basic_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 

diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings
index 3400f339bffcc2bc24df8d4e4050368811a0bf24..8e13cf2bb2c896b6d44180f5a7ac896299292953 100644 (file)
--- a/level_3/fss_basic_list_write/data/build/settings
+++ b/level_3/fss_basic_list_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h
index d079c66274d40eafe7eae67cc6ade6c90b86f604..f21ab8a33d76e472400294fef95521d432b396df 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.h
+++ b/level_3/fss_basic_read/c/fss_basic_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_basic.h>
+#include <fll/level_2/fss/basic.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings
index 5bf1f9c9df7c59c5c55600dfecf443cec49cb90c..1535be19e3bd07c47e93d0575da0f62581ac1937 100644 (file)
--- a/level_3/fss_basic_read/data/build/settings
+++ b/level_3/fss_basic_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h
index f893f8799ed4966cc39979235b0b30c8ea1b6dd2..570cbd893862638a6e749adf9810f8aa6eb8b967 100644 (file)
--- a/level_3/fss_basic_write/c/fss_basic_write.h
+++ b/level_3/fss_basic_write/c/fss_basic_write.h
@@ -30,13 +30,13 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 
 // FLL-2 includes.
 #include <fll/level_2/error.h>
-#include <fll/level_2/fss_basic.h>
+#include <fll/level_2/fss/basic.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings
index 824118e7a7bb9d1e2e8796ee5124973ed709c26c..6f6997a47714f312a6ac9e3eabc3ff5ac130d8cd 100644 (file)
--- a/level_3/fss_basic_write/data/build/settings
+++ b/level_3/fss_basic_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
index 943fbff6801cfce9df434284c5e567f5cb550e8e..b30fdc6ce0c1d7a55b0b2baba79d4c19599986ff 100644 (file)
--- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
+++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_embedded_list.h>
+#include <fll/level_2/fss/embedded_list.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_embedded_list_read/data/build/settings b/level_3/fss_embedded_list_read/data/build/settings
index b0e810ec7fa68748cb3317488c65fe7fd177d419..583ecb6f2b6b40ab90e8fa85b15ba98168b9ef5e 100644 (file)
--- a/level_3/fss_embedded_list_read/data/build/settings
+++ b/level_3/fss_embedded_list_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
index 859d8c801c3aeff069e2ba3fb18e579ea07123be..a0d6c38a507983c9b1293bd914367ae2394ddb63 100644 (file)
--- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
+++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
@@ -31,7 +31,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/conversion.h>
-#include <fll/level_1/fss_embedded_list.h>
+#include <fll/level_1/fss/embedded_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 

diff --git a/level_3/fss_embedded_list_write/data/build/settings b/level_3/fss_embedded_list_write/data/build/settings
index 0a254a61ed62ed55e2e6c34a48232f87cf3e6a1a..61fb107c95b4b106cab963fd1ade6c4895ead174 100644 (file)
--- a/level_3/fss_embedded_list_write/data/build/settings
+++ b/level_3/fss_embedded_list_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.h b/level_3/fss_extended_list_read/c/fss_extended_list_read.h
index b20a762eb935d86f02770071fd652945e30bc98e..6783035b7c2aae5802c3de49ac8e978017225916 100644 (file)
--- a/level_3/fss_extended_list_read/c/fss_extended_list_read.h
+++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_extended_list.h>
+#include <fll/level_2/fss/extended_list.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings
index 1d02ce3d6083ba829d9fb71ac9b8ca73581eb74b..b9808aec28f4dd3385ed00355c667bac245a4d87 100644 (file)
--- a/level_3/fss_extended_list_read/data/build/settings
+++ b/level_3/fss_extended_list_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.h b/level_3/fss_extended_list_write/c/fss_extended_list_write.h
index 75661fc78ce1d2e5d8711c391ff459259f042242..d8e3e91c615d1af66cc10bcd67e4247915376fc0 100644 (file)
--- a/level_3/fss_extended_list_write/c/fss_extended_list_write.h
+++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.h
@@ -31,7 +31,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/conversion.h>
-#include <fll/level_1/fss_extended_list.h>
+#include <fll/level_1/fss/extended_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 

diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings
index fece3b7057d9e390fb92dec03ccea5c39ed4e086..207e704c01ef27588887d63cb37a11f230945700 100644 (file)
--- a/level_3/fss_extended_list_write/data/build/settings
+++ b/level_3/fss_extended_list_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h
index 38f489632c2b2dbf456d746fd9291531c56d98c7..9022f4f11ab7219c72a6a6ae9b5b74030bf447c1 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.h
+++ b/level_3/fss_extended_read/c/fss_extended_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings
index 6553164b61d7e837ad1240c2316c6c9a867a4bb9..933c5bb25c8988716b79cdf3a8b1527fe49efa2a 100644 (file)
--- a/level_3/fss_extended_read/data/build/settings
+++ b/level_3/fss_extended_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h
index 835744e0084528d3e083aed45feb3132a991e75e..a75ddcd15050270324b77e7092f6b8d70d14c452 100644 (file)
--- a/level_3/fss_extended_write/c/fss_extended_write.h
+++ b/level_3/fss_extended_write/c/fss_extended_write.h
@@ -30,13 +30,13 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/fss_extended.h>
+#include <fll/level_1/fss/extended.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 
 // FLL-2 includes.
 #include <fll/level_2/error.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings
index 845f5a4af8a475518a6440db2584e41229538959..54c2e8131c981f551ab91cf3cfa59cad11cd56de 100644 (file)
--- a/level_3/fss_extended_write/data/build/settings
+++ b/level_3/fss_extended_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_identify/data/build/settings b/level_3/fss_identify/data/build/settings
index 58dab223964b0b2012652b3fa21757b596ffe94f..6ed694ae12467c4f2ac8349375dc0606521e3062 100644 (file)
--- a/level_3/fss_identify/data/build/settings
+++ b/level_3/fss_identify/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_payload_read/c/fss_payload_read.h b/level_3/fss_payload_read/c/fss_payload_read.h
index 4defbf63b097b8246c5aedb67569d02839b15331..4f5caa3f7a992ab4dc4726537f8f6cfa3012c6f7 100644 (file)
--- a/level_3/fss_payload_read/c/fss_payload_read.h
+++ b/level_3/fss_payload_read/c/fss_payload_read.h
@@ -43,8 +43,8 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_extended.h>
-#include <fll/level_2/fss_payload.h>
+#include <fll/level_2/fss/extended.h>
+#include <fll/level_2/fss/payload.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_payload_read/data/build/settings b/level_3/fss_payload_read/data/build/settings
index d798bed25a158ed370945765ac2b35c99a9ef2f9..2ec9c9a2b7c0ce2686d7facf1c4cfb8f098a2fcc 100644 (file)
--- a/level_3/fss_payload_read/data/build/settings
+++ b/level_3/fss_payload_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_payload_write/c/fss_payload_write.h b/level_3/fss_payload_write/c/fss_payload_write.h
index ca28e35fe604798906acbb44e93b1f67f76120bd..1679a62095778ccacff6906778ca70bcd2ca2d3d 100644 (file)
--- a/level_3/fss_payload_write/c/fss_payload_write.h
+++ b/level_3/fss_payload_write/c/fss_payload_write.h
@@ -30,13 +30,13 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/fss_basic_list.h>
+#include <fll/level_1/fss/basic_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 
 // FLL-2 includes.
 #include <fll/level_2/error.h>
-#include <fll/level_2/fss_payload.h>
+#include <fll/level_2/fss/payload.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_payload_write/data/build/settings b/level_3/fss_payload_write/data/build/settings
index d3552fb139a4e35c5a4be41a39cfa1d2e0153ec5..45c05f70abcbaf3dfe9cd180db0c09c153fdaf69 100644 (file)
--- a/level_3/fss_payload_write/data/build/settings
+++ b/level_3/fss_payload_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings
index a0c2e02066bc9cb937898082506fcbb6e3e0e691..e6c0dbc2acae73d73793cac540b8fb63320604f5 100644 (file)
--- a/level_3/fss_status_code/data/build/settings
+++ b/level_3/fss_status_code/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings
index 9003c43d9d0c2f3dd20b19234c266834bb555afa..e03c588fac517f3f54c4962992004d2a33763978 100644 (file)
--- a/level_3/iki_read/data/build/settings
+++ b/level_3/iki_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings
index c1ed8eb7d1b16d53302d419cd11b39c6bcfc7cb8..8d348fc0dd30055caaf525665ecb51a8c50b95ee 100644 (file)
--- a/level_3/iki_write/data/build/settings
+++ b/level_3/iki_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings
index 655c33f417b481b7978be7cd9d1360cbc1d48c79..d6c05f24c85ab5fecb35b1939c68b193b3d8a106 100644 (file)
--- a/level_3/status_code/data/build/settings
+++ b/level_3/status_code/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/utf8/data/build/settings b/level_3/utf8/data/build/settings
index 39ac4ae065b5620c45ee3c7d3626bd8527f63bec..fd2b456191701d555303f631c22137ac77fc039c 100644 (file)
--- a/level_3/utf8/data/build/settings
+++ b/level_3/utf8/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes