Cleanup: dependencies helper script.

Rename individual_dependencies to dependencies_individual.

Organize all dependencies by level.

If possible, sort each dependency.

diff --git a/build/scripts/package.sh b/build/scripts/package.sh
index a8f8c987cc762d3bb970b832817f2fc306be67d5..0b13893a6bf8b377564b91f2b5353ec739b0c74f 100644 (file)
--- a/build/scripts/package.sh
+++ b/build/scripts/package.sh
@@ -4,7 +4,7 @@
 #
 # The purpose of this script is to create releases from the project source.
 # These release directories can then be used to compile the project or to package the project.
-# The dependencies of this script are: basename, bash, chmod, grep, and sed.
+# The dependencies of this script are: basename, bash, chmod, grep, sed, and sort.
 
 package_main() {
   local public_name="Simple FLL Project Package Script"
@@ -466,6 +466,10 @@ package_dependencies_individual() {
   local settings=
   local name=
   local dependencies=
+  local dependencies_0=
+  local dependencies_1=
+  local dependencies_2=
+  local dependencies_individual=
   local dependency=
   local sub_level=
   local sub_dependencies=
@@ -473,7 +477,6 @@ package_dependencies_individual() {
   local sub_sub_level=
   local sub_sub_dependencies=
   local sub_sub_dependency=
-  local individual_dependencies=
 
   for directory in ${path_sources}level_0/* ${path_sources}level_1/* ${path_sources}level_2/* ${path_sources}level_3/* ; do
     name="$(echo $directory | sed -e "s|${path_sources}level_0/||" -e "s|${path_sources}level_1/||" -e "s|${path_sources}level_2/||" -e "s|${path_sources}level_3/||")"
@@ -504,11 +507,15 @@ package_dependencies_individual() {
     fi
 
     dependencies=
+    dependencies_0=
+    dependencies_1=
+    dependencies_2=
+    dependencies_individual=
+
     if [[ -f ${directory}/data/build/dependencies ]] ; then
       dependencies=$(cat ${directory}/data/build/dependencies | sed -e "/^\s*#/d" -e "s|#\.*$||")
     fi
 
-    individual_dependencies=
     for dependency in $dependencies ; do
       if [[ $(echo "$dependency" | grep -o "^f_") != "" ]] ; then
         level=level_0
@@ -605,17 +612,17 @@ package_dependencies_individual() {
       break;
     fi
 
-    individual_dependencies=$(echo "$individual_dependencies" | sed -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||')
-    if [[ $individual_dependencies != "" ]] ; then
+    dependencies_individual=$(echo "$dependencies_individual" | sed -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||' -e 's|[[:space:]][[:space:]]*$| |')
+    if [[ $dependencies_individual != "" ]] ; then
       if [[ $verbosity == "verbose" ]] ; then
-        echo -e " $individual_dependencies"
+        echo -e " $dependencies_individual"
       fi
 
-      individual_dependencies=" $individual_dependencies"
+      dependencies_individual=" $dependencies_individual"
     fi
 
     settings=${directory}/data/build/settings
-    sed -i -e "s|^\s*build_libraries-individual\>.*\$|build_libraries-individual$individual_dependencies|" $settings
+    sed -i -e "s|^\s*build_libraries-individual\>.*\$|build_libraries-individual$dependencies_individual|" $settings
 
     if [[ $? -ne 0 ]] ; then
       if [[ $verbosity != "quiet" ]] ; then
@@ -671,8 +678,46 @@ package_dependencies_individual_append() {
 
   libraries=$(grep -o '^\s*build_sources_library\>.*$' $settings | sed -e 's|^\s*build_sources_library\>||' -e 's|^[[:space:]]*||' -e 's|[[:space:]]*$||')
   if [[ $libraries != "" ]] ; then
-    if [[ $(echo -n $individual_dependencies | grep -o "\-l$dependency\>") == "" ]] ; then
-      individual_dependencies="-l$dependency $individual_dependencies"
+    if [[ $(echo -n $dependencies_individual | grep -o "\-l$dependency\>") == "" ]] ; then
+
+      if [[ "$(type -p sort)" != "" ]] ; then
+        if [[ $level == "level_0" ]] ; then
+          dependencies_0="-l$dependency $dependencies_0"
+          dependencies_0="$(for i in $dependencies_0; do echo $i ; done | sort)"
+          dependencies_0=$(echo $dependencies_0)
+        elif [[ $level == "level_1" ]] ; then
+          dependencies_1="-l$dependency $dependencies_1"
+          dependencies_1=" $(for i in $dependencies_1; do echo $i ; done | sort)"
+          dependencies_1=$(echo $dependencies_1)
+        else
+          dependencies_2="-l$dependency $dependencies_2"
+          dependencies_2=" $(for i in $dependencies_2; do echo $i ; done | sort)"
+          dependencies_2=$(echo $dependencies_2)
+        fi
+      else
+        # sort is not available, so do not bother trying to sort.
+        if [[ $level == "level_0" ]] ; then
+          dependencies_0="-l$dependency $dependencies_0"
+        elif [[ $level == "level_1" ]] ; then
+          dependencies_1="-l$dependency $dependencies_1"
+        else
+          dependencies_2="-l$dependency $dependencies_2"
+        fi
+      fi
+
+      dependencies_individual=
+
+      if [[ $dependencies_0 != "" ]] ; then
+        dependencies_individual="$dependencies_0"
+      fi
+
+      if [[ $dependencies_1 != "" ]] ; then
+        dependencies_individual="$dependencies_individual $dependencies_1"
+      fi
+
+      if [[ $dependencies_2 != "" ]] ; then
+        dependencies_individual="$dependencies_individual $dependencies_2"
+      fi
     fi
   fi
 }

diff --git a/level_0/f_console/data/build/settings b/level_0/f_console/data/build/settings
index 7c849e40af821a933cd1c9a2aa6bd912ee42c45c..bad71738174587deff709c62371b3152dab92438 100644 (file)
--- a/level_0/f_console/data/build/settings
+++ b/level_0/f_console/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_utf -lf_memory
+build_libraries-individual -lf_memory -lf_utf
 build_sources_library console.c
 build_sources_program
 build_sources_headers console.h console-common.h

diff --git a/level_0/f_conversion/data/build/settings b/level_0/f_conversion/data/build/settings
index abc08fa6d490035fcdf2a8184211df571a6bc977..7686d31cccb9fcd9c6a96ee24a3d9edf583d7914 100644 (file)
--- a/level_0/f_conversion/data/build/settings
+++ b/level_0/f_conversion/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_utf -lf_memory
+build_libraries-individual -lf_memory -lf_utf
 build_sources_library conversion.c
 build_sources_program
 build_sources_headers conversion.h conversion-common.h

diff --git a/level_0/f_fss/data/build/settings b/level_0/f_fss/data/build/settings
index c93199e3b058eebb6260ddf91e9981e7b0c923f6..17e05451a49fb47d44cd19b6d44120d10d2047a7 100644 (file)
--- a/level_0/f_fss/data/build/settings
+++ b/level_0/f_fss/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_utf -lf_memory
+build_libraries-individual -lf_memory -lf_utf
 build_sources_library fss.c
 build_sources_program
 build_sources_headers fss.h fss-common.h fss_named.h fss_nest.h fss_quote.h fss_set.h

diff --git a/level_0/f_iki/data/build/settings b/level_0/f_iki/data/build/settings
index 39eba46279549af55a03c15ea6091762b47316b6..b13ebeabfb541ca41063cbae7ab9f605691a3ab4 100644 (file)
--- a/level_0/f_iki/data/build/settings
+++ b/level_0/f_iki/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_utf -lf_memory
+build_libraries-individual -lf_memory -lf_utf
 build_sources_library iki.c private-iki.c
 build_sources_program
 build_sources_headers iki.h iki-common.h

diff --git a/level_0/f_serialize/data/build/settings b/level_0/f_serialize/data/build/settings
index d0f6cfce34ae6bd0eb06496d577a5b082bec6ae7..98d859b054088813b247f76eacb4e1d9faff43d4 100644 (file)
--- a/level_0/f_serialize/data/build/settings
+++ b/level_0/f_serialize/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_utf -lf_memory
+build_libraries-individual -lf_memory -lf_utf
 build_sources_library serialize.c private-serialize.c
 build_sources_program
 build_sources_headers serialize.h serialize-common.h

diff --git a/level_1/fl_color/data/build/settings b/level_1/fl_color/data/build/settings
index 5254254586d2822d54daa6bfc63b86d6b4a19eca..9c53b53e9edbdd76aab60e8571a9c164c272d176 100644 (file)
--- a/level_1/fl_color/data/build/settings
+++ b/level_1/fl_color/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_print -lf_file -lf_memory
+build_libraries-individual -lf_file -lf_memory -lf_print
 build_sources_library color.c
 build_sources_program
 build_sources_headers color.h

diff --git a/level_1/fl_console/data/build/settings b/level_1/fl_console/data/build/settings
index 8daaed7838acc50510b5e09201442f865e89e811..40c9d796fb8c137e832f530550f75208b97d9b4d 100644 (file)
--- a/level_1/fl_console/data/build/settings
+++ b/level_1/fl_console/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_conversion -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_memory -lf_utf
 build_sources_library console.c
 build_sources_program
 build_sources_headers console.h

diff --git a/level_1/fl_conversion/data/build/settings b/level_1/fl_conversion/data/build/settings
index 06cb0009c62488dda7a5fd177a649a1c46352336..fcdbe03462b59403c5f891102c8de7e9bd13d7ce 100644 (file)
--- a/level_1/fl_conversion/data/build/settings
+++ b/level_1/fl_conversion/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_conversion -lf_utf -lf_memory
+build_libraries-individual -lf_conversion -lf_memory -lf_utf
 build_sources_library conversion.c
 build_sources_program
 build_sources_headers conversion.h

diff --git a/level_1/fl_directory/data/build/settings b/level_1/fl_directory/data/build/settings
index 2f76bb176dada639b32595ea3f332e078533955d..84dbd40ea2670066ea7b5de8e8686a96927b371b 100644 (file)
--- a/level_1/fl_directory/data/build/settings
+++ b/level_1/fl_directory/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_path -lf_file -lf_directory -lf_utf -lf_memory
+build_libraries-individual -lf_directory -lf_file -lf_memory -lf_path -lf_utf
 build_sources_library directory.c private-directory.c
 build_sources_program
 build_sources_headers directory.h

diff --git a/level_1/fl_environment/data/build/settings b/level_1/fl_environment/data/build/settings
index 58e59b3b0a8e3c9b77a0b751cdd3e015fbdf4a13..c7fb98bfc39c2525855d0e359e49ea2a2b308542 100644 (file)
--- a/level_1/fl_environment/data/build/settings
+++ b/level_1/fl_environment/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_path -lf_environment -lf_utf -lf_memory
+build_libraries-individual -lf_environment -lf_memory -lf_path -lf_utf
 build_sources_library environment.c
 build_sources_program
 build_sources_headers environment.h

diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings
index 5247a0bf831dbf1c8602555b90d18c98fad9d730..7a813e1002162008f1d3406a0f9a756a55b50a5b 100644 (file)
--- a/level_1/fl_fss/data/build/settings
+++ b/level_1/fl_fss/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_fss -lf_file -lf_utf -lf_memory
+build_libraries-individual -lf_file -lf_fss -lf_memory -lf_utf
 build_sources_library private-fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c
 build_sources_program
 build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h

diff --git a/level_1/fl_iki/data/build/settings b/level_1/fl_iki/data/build/settings
index 056c0c9dd7e0bb9acae47a1758c595e55a60f6fa..2ae8b8bbc8f474d6d445160eff8b7bd1bd6622b2 100644 (file)
--- a/level_1/fl_iki/data/build/settings
+++ b/level_1/fl_iki/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_iki -lf_utf -lf_memory
+build_libraries-individual -lf_iki -lf_memory -lf_utf
 build_sources_library iki.c
 build_sources_program
 build_sources_headers iki.h

diff --git a/level_1/fl_print/data/build/settings b/level_1/fl_print/data/build/settings
index 08757eff98842317bac2de6043b501d9fc39e517..dcfb1804152e031b7cf99682b6e85308aced95ae 100644 (file)
--- a/level_1/fl_print/data/build/settings
+++ b/level_1/fl_print/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_print -lf_conversion -lf_utf -lf_memory
+build_libraries-individual -lf_conversion -lf_memory -lf_print -lf_utf
 build_sources_library print.c
 build_sources_program
 build_sources_headers print.h

diff --git a/level_1/fl_status/data/build/settings b/level_1/fl_status/data/build/settings
index cbb48b494af695c26edba6f76fb0df0304edf37b..22dde226a4d83a75653952a8c54236eec8f383ae 100644 (file)
--- a/level_1/fl_status/data/build/settings
+++ b/level_1/fl_status/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_utf -lf_memory
+build_libraries-individual -lf_memory -lf_utf
 build_sources_library status.c
 build_sources_program
 build_sources_headers status.h

diff --git a/level_1/fl_string/data/build/settings b/level_1/fl_string/data/build/settings
index b9d76a00613541ef804a62b948835e8c3fdbe0e7..a5a780f43324429467df7d478eb876820a3e3024 100644 (file)
--- a/level_1/fl_string/data/build/settings
+++ b/level_1/fl_string/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_utf -lf_memory
+build_libraries-individual -lf_memory -lf_utf
 build_sources_library string.c private-string.c
 build_sources_program
 build_sources_headers string.h

diff --git a/level_1/fl_utf/data/build/settings b/level_1/fl_utf/data/build/settings
index 92467c2d05021909f5c21ada6cea9c614bb2630b..3b42ec31c3e2d7f7151f01d7ef130f1f676beccf 100644 (file)
--- a/level_1/fl_utf/data/build/settings
+++ b/level_1/fl_utf/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_utf -lf_memory
+build_libraries-individual -lf_memory -lf_utf
 build_sources_library utf.c private-utf.c
 build_sources_program
 build_sources_headers utf.h

diff --git a/level_1/fl_utf_file/data/build/settings b/level_1/fl_utf_file/data/build/settings
index f13a495e8995fd49eb44bf563cc2d731e117f2ce..fee6f82933c9c41d1de9347dd9b780ee22a416ef 100644 (file)
--- a/level_1/fl_utf_file/data/build/settings
+++ b/level_1/fl_utf_file/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lf_file -lf_utf -lf_memory
+build_libraries-individual -lf_file -lf_memory -lf_utf
 build_sources_library utf_file.c private-utf_file.c
 build_sources_program
 build_sources_headers utf_file.h

diff --git a/level_2/fll_error/data/build/settings b/level_2/fll_error/data/build/settings
index 649ceed67948e1d884c0f3ce605f08bf232d4b3c..c03df46c90e8742e53c34162b4d4e0158aa37dc6 100644 (file)
--- a/level_2/fll_error/data/build/settings
+++ b/level_2/fll_error/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfl_string -lf_print -lf_file -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_file -lf_memory -lf_print -lf_utf -lfl_string
 build_sources_library error.c private-error.c
 build_sources_program
 build_sources_headers error.h error-common.h

diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings
index b3842acbecb1f71bef241c0cff548a7507112057..0a67dd632af62f8b0b072f1646b3d90511786700 100644 (file)
--- a/level_2/fll_execute/data/build/settings
+++ b/level_2/fll_execute/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfl_string -lfl_environment -lf_utf -lf_signal -lf_path -lf_file -lf_environment -lf_memory
+build_libraries-individual -lf_environment -lf_file -lf_memory -lf_path -lf_signal -lf_utf -lfl_environment -lfl_string
 build_sources_library execute.c private-execute.c
 build_sources_program
 build_sources_headers execute.h

diff --git a/level_2/fll_file/data/build/settings b/level_2/fll_file/data/build/settings
index 055cb75722733e57b94978288d85b560f075cd18..8f42a4b683bc4cd0b8e20c43f993edfb4a089502 100644 (file)
--- a/level_2/fll_file/data/build/settings
+++ b/level_2/fll_file/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfl_directory -lf_path -lf_utf -lfl_color -lf_print -lf_file -lf_directory -lf_memory
+build_libraries-individual -lf_directory -lf_file -lf_memory -lf_path -lf_print -lf_utf -lfl_color -lfl_directory
 build_sources_library file.c private-file.c
 build_sources_program
 build_sources_headers file.h

diff --git a/level_2/fll_fss/data/build/settings b/level_2/fll_fss/data/build/settings
index daaf14f98c6ec640bc5b9733889d9a8b040b2c0b..fb06e18fec125bc437eda84ca1986a7be447f685 100644 (file)
--- a/level_2/fll_fss/data/build/settings
+++ b/level_2/fll_fss/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfl_string -lfl_status -lfl_fss -lfl_conversion -lf_file -lf_fss -lf_conversion -lf_utf -lf_memory
+build_libraries-individual -lf_conversion -lf_file -lf_fss -lf_memory -lf_utf -lfl_conversion -lfl_fss -lfl_status -lfl_string
 build_sources_library fss.c private-fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c fss_status.c
 build_sources_program
 build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_status.h

diff --git a/level_2/fll_iki/data/build/settings b/level_2/fll_iki/data/build/settings
index 98d9f533848fdcf0a1846ad991f87d0edfbd9774..8a93c229de0125728952a0ea8a06412cc0d0b951 100644 (file)
--- a/level_2/fll_iki/data/build/settings
+++ b/level_2/fll_iki/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfl_string -lfl_iki -lf_iki -lf_utf -lf_memory
+build_libraries-individual -lf_iki -lf_memory -lf_utf -lfl_iki -lfl_string
 build_sources_library iki.c private-iki.c
 build_sources_program
 build_sources_headers iki.h

diff --git a/level_2/fll_path/data/build/settings b/level_2/fll_path/data/build/settings
index e3f3575db40af34664f19b134b5d9b77e1cc9917..12d2454cae2d9c13bd03e8a23ef524ed6dcd04c4 100644 (file)
--- a/level_2/fll_path/data/build/settings
+++ b/level_2/fll_path/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfl_string -lf_utf -lf_path -lf_memory
+build_libraries-individual -lf_memory -lf_path -lf_utf -lfl_string
 build_sources_library path.c
 build_sources_program
 build_sources_headers path.h

diff --git a/level_2/fll_program/data/build/settings b/level_2/fll_program/data/build/settings
index 4dc85022b5ee85c80b4b340b754214777654776e..d261177503beff48f3c9ad3093d13251863c7586 100644 (file)
--- a/level_2/fll_program/data/build/settings
+++ b/level_2/fll_program/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfl_string -lfl_color -lf_print -lf_file -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_file -lf_memory -lf_print -lf_utf -lfl_color -lfl_string
 build_sources_library program.c
 build_sources_program
 build_sources_headers program.h

diff --git a/level_2/fll_status/data/build/settings b/level_2/fll_status/data/build/settings
index 388d563e1b5af4ad4578f8517ca876b4401bf65e..88cdaef923cf07dc464237c5edbae777f796ba7f 100644 (file)
--- a/level_2/fll_status/data/build/settings
+++ b/level_2/fll_status/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfl_string -lfl_status -lf_conversion -lf_utf -lf_memory
+build_libraries-individual -lf_conversion -lf_memory -lf_utf -lfl_status -lfl_string
 build_sources_library status.c
 build_sources_program
 build_sources_headers status.h

diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings
index 70771e36d6ea93e2b158e82e0fef361924e9f130..9d9c0e91adf197479c2e7208956b8a2454bac9c9 100644 (file)
--- a/level_3/byte_dump/data/build/settings
+++ b/level_3/byte_dump/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_error -lfl_utf -lfl_string -lfl_conversion -lfl_console -lfl_color -lf_print -lf_pipe -lf_file -lf_conversion -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_file -lf_memory -lf_pipe -lf_print -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_string -lfl_utf -lfll_error -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library byte_dump.c private-byte_dump.c

diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings
index 651782d3583223a20c77dd626d35fba7506789e9..958c2186bbb0faf43b974d36d93c06cae9c79c0a 100644 (file)
--- a/level_3/fake/data/build/settings
+++ b/level_3/fake/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_path -lfll_fss -lfll_file -lfll_execute -lfl_environment -lfll_error -lfl_utf -lfl_string -lfl_status -lfl_iki -lfl_fss -lfl_directory -lfl_conversion -lfl_console -lfl_color -lf_signal -lf_print -lf_path -lf_iki -lf_file -lf_fss -lf_environment -lf_directory -lf_conversion -lf_console -lf_account -lf_utf -lf_memory
+build_libraries-individual -lf_account -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_iki -lf_memory -lf_path -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_status -lfl_string -lfl_utf -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_path -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fake.c private-fake.c private-clean.c private-build.c private-make.c private-print.c private-skeleton.c

diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings
index 88ff580aef734e1002e314c2382859dcd0579748..0fcd532b02aefd751ceadeb780e53cf759829a67 100644 (file)
--- a/level_3/firewall/data/build/settings
+++ b/level_3/firewall/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfll_execute -lfl_environment -lf_signal -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_path -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library firewall.c private-firewall.c

diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings
index 5671dad595da853f7ed266b13eb3ee96553e5bba..c804c24e998bc1bfd69b3c3bcc054b858d7d64bd 100644 (file)
--- a/level_3/fss_basic_list_read/data/build/settings
+++ b/level_3/fss_basic_list_read/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_print -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fss_basic_list_read.c private-fss_basic_list_read.c

diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings
index 8348d98f2d07be24948eac8bcbc1431684222372..49876b5ed4bd850c42de98a51cbdc002fbf6b2d3 100644 (file)
--- a/level_3/fss_basic_list_write/data/build/settings
+++ b/level_3/fss_basic_list_write/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fss_basic_list_write.c private-fss_basic_list_write.c

diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings
index 9ba364a0f49585ac9b25cfe39813f8fa409a436f..05c7fa1b365a023cc628349bea3e96ab5268ccc1 100644 (file)
--- a/level_3/fss_basic_read/data/build/settings
+++ b/level_3/fss_basic_read/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_print -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fss_basic_read.c private-fss_basic_read.c

diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings
index 333aee4b52f6634379d0b618b6176d085e7b1739..f22bfdf31155b8dc238a3eff90d2ba9dbfd819d2 100644 (file)
--- a/level_3/fss_basic_write/data/build/settings
+++ b/level_3/fss_basic_write/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fss_basic_write.c private-fss_basic_write.c

diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings
index afaaaeb55ea7297e6e28c321b964c4ada29af4b6..2f20a28e9458b2ab0ae5cd1f6dd3aaa5108e37e6 100644 (file)
--- a/level_3/fss_extended_list_read/data/build/settings
+++ b/level_3/fss_extended_list_read/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_print -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fss_extended_list_read.c private-fss_extended_list_read.c

diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings
index 1ea864c04b31ee944c9711d088bef963fb3663b6..ffa49d25e9ec9247b3de18f145d6735bb38012f7 100644 (file)
--- a/level_3/fss_extended_list_write/data/build/settings
+++ b/level_3/fss_extended_list_write/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fss_extended_list_write.c private-fss_extended_list_write.c

diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings
index 6a985d7797e71bc91cd7de790a381aee01416086..41669b1359b5be9980349c92e3bfeb5f8324333f 100644 (file)
--- a/level_3/fss_extended_read/data/build/settings
+++ b/level_3/fss_extended_read/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_print -lfl_fss -lfl_console -lfl_conversion -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_print -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fss_extended_read.c private-fss_extended_read.c

diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings
index 04861e459fc43f7fc6fcb2d161bb215afbc9db86..d4c014109dd7397b1c039fe384f3fe7b001d675a 100644 (file)
--- a/level_3/fss_extended_write/data/build/settings
+++ b/level_3/fss_extended_write/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_conversion -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fss_extended_write.c private-fss_extended_write.c

diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings
index 2f748e8fef49eaf1a1a20a078fece7c61aaaa393..51393780cd82613b08bfdc849db4c8313a6244ca 100644 (file)
--- a/level_3/fss_status_code/data/build/settings
+++ b/level_3/fss_status_code/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_status -lfll_program -lfll_fss -lfll_file -lfl_directory -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_utf -lfl_string -lfl_status -lfl_fss -lfl_conversion -lfl_console -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_conversion -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_status -lfl_string -lfl_utf -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_program -lfll_status
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library fss_status_code.c private-fss_status_code.c

diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings
index 6c149cc7fba4ab63ddb6df8a9e03ea7bb5ccda77..357659be6d71606cb65f192387e06d22ef753a6a 100644 (file)
--- a/level_3/iki_read/data/build/settings
+++ b/level_3/iki_read/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_error -lfl_string -lfl_iki -lfl_conversion -lfl_console -lfl_color -lf_print -lf_pipe -lf_iki -lf_file -lf_conversion -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_pipe -lf_print -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_iki -lfl_string -lfll_error -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library iki_read.c private-iki_read.c

diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings
index aa1be1d5d83e78840d798a530bd0e967652b5971..b80b90fa4784a504a117c5f91c16dcf728e47ee1 100644 (file)
--- a/level_3/iki_write/data/build/settings
+++ b/level_3/iki_write/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_error -lfll_iki -lfl_string -lfl_iki -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_iki -lf_file -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_pipe -lf_print -lf_utf -lfl_color -lfl_console -lfl_iki -lfl_string -lfll_error -lfll_iki -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library iki_write.c private-iki_write.c

diff --git a/level_3/init/data/build/settings b/level_3/init/data/build/settings
index 6d0e79ad27468b9ccb1cdc89210783e08068da92..097bdab088d8c14bebdf6e05c8dca3b7c6e9de30 100644 (file)
--- a/level_3/init/data/build/settings
+++ b/level_3/init/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_program -lfll_fss -lfl_conversion -lfll_execute -lfl_environment -lf_signal -lf_path -lfll_error -lfl_string -lfl_status -lfl_fss -lfl_console -lf_conversion -lfl_color -lf_print -lf_pipe -lf_fss -lf_file -lf_environment -lf_directory -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_environment -lfl_fss -lfl_status -lfl_string -lfll_error -lfll_execute -lfll_fss -lfll_program
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library init.c private-init.c

diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings
index 64bcff2aca62c9321bb2e0722096e6d414c0ab14..c10e71698541646a8b58c8bb033476cf381b5b6d 100644 (file)
--- a/level_3/status_code/data/build/settings
+++ b/level_3/status_code/data/build/settings
@@ -19,7 +19,7 @@ build_compiler gcc
 build_indexer ar
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_status -lfll_program -lfll_error -lfl_utf -lfl_string -lfl_status -lfl_conversion -lfl_console -lfl_color -lf_print -lf_pipe -lf_file -lf_conversion -lf_console -lf_utf -lf_memory
+build_libraries-individual -lf_console -lf_conversion -lf_file -lf_memory -lf_pipe -lf_print -lf_utf -lfl_color -lfl_console -lfl_conversion -lfl_status -lfl_string -lfl_utf -lfll_error -lfll_program -lfll_status
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_sources_library status_code.c private-status_code.c