Update: Bring in build settings changes from FLL.

diff --git a/data/build/settings b/data/build/settings
index 240e838117260b33bb3dd0d9b200b92b01d0101d..f265bb8e66243367e1f7d9eeda4a7091ae461a9e 100644 (file)
--- a/data/build/settings
+++ b/data/build/settings
@@ -53,27 +53,6 @@ build_libraries_static-individual_thread -l:libf_thread.a
 build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a -l:libcap.a
 build_libraries_static-monolithic -l:libfll.a -l:libcap.a
 
-build_sources_library common.c common/define.c common/enumeration.c common/string.c common/type.c
-build_sources_library common/type/cache.c common/type/control.c common/type/entry.c common/type/execute.c common/type/instance.c common/type/interrupt.c common/type/lock.c common/type/process.c common/type/rule.c common/type/thread.c
-build_sources_library common/string/general.c common/string/rule.c
-build_sources_library convert.c instance.c instance/prepare.c instance/wait.c
-build_sources_library entry.c entry/action.c entry/preprocess.c entry/process.c entry/setting.c
-build_sources_library file.c lock.c mutex.c path.c process.c
-build_sources_library rule.c rule/action.c rule/execute.c rule/expand.c rule/instance.c rule/is.c rule/item.c rule/parameter.c rule/read.c rule/setting.c rule/wait.c
-build_sources_library perform.c
-build_sources_library print/debug.c print/debug/rule/action.c print/debug/rule/execute.c print/debug/rule/instance.c print/debug/perform/control.c print/debug/perform/pid.c
-build_sources_library print/error.c
-build_sources_library print/error/entry.c print/error/entry/action.c print/error/entry/item.c print/error/entry/setting.c
-build_sources_library print/error/perform/pid.c
-build_sources_library print/error/rule.c print/error/rule/action.c print/error/rule/instance.c print/error/rule/item.c print/error/rule/setting.c
-build_sources_library print/lock.c print/error/lock.c
-build_sources_library print/output/entry/setting.c print/output/rule/execute.c print/output/rule/setting.c print/output/rule/validate.c
-build_sources_library print/message.c print/message/entry.c print/message/entry/action.c print/message/entry/item.c
-build_sources_library print/warning/entry/action.c print/warning/entry/item.c print/warning/entry/setting.c print/warning/rule/action.c print/warning/rule/item.c print/warning/rule/setting.c
-build_sources_library signal.c status.c time.c
-build_sources_library thread.c thread/cleanup.c thread/control.c thread/enable.c thread/entry.c thread/instance.c thread/is.c thread/rule.c thread/signal.c
-build_sources_library validate.c
-
 build_sources_headers common.h controller.h common/define.h common/enumeration.h common/string.h common/thread.h common/type.h
 build_sources_headers common/define/control.h common/define/entry.h common/define/instance.h common/define/rule.h common/define/thread.h
 build_sources_headers common/enumeration/control.h common/enumeration/entry.h common/enumeration/instance.h common/enumeration/process.h common/enumeration/rule.h common/enumeration/thread.h
@@ -97,6 +76,27 @@ build_sources_headers signal.h status.h time.h
 build_sources_headers thread.h thread/cleanup.h thread/control.h thread/enable.h thread/entry.h thread/instance.h thread/is.h thread/rule.h thread/signal.h
 build_sources_headers validate.h
 
+build_sources_library common.c common/define.c common/enumeration.c common/string.c common/type.c
+build_sources_library common/type/cache.c common/type/control.c common/type/entry.c common/type/execute.c common/type/instance.c common/type/interrupt.c common/type/lock.c common/type/process.c common/type/rule.c common/type/thread.c
+build_sources_library common/string/general.c common/string/rule.c
+build_sources_library convert.c instance.c instance/prepare.c instance/wait.c
+build_sources_library entry.c entry/action.c entry/preprocess.c entry/process.c entry/setting.c
+build_sources_library file.c lock.c mutex.c path.c process.c
+build_sources_library rule.c rule/action.c rule/execute.c rule/expand.c rule/instance.c rule/is.c rule/item.c rule/parameter.c rule/read.c rule/setting.c rule/wait.c
+build_sources_library perform.c
+build_sources_library print/debug.c print/debug/rule/action.c print/debug/rule/execute.c print/debug/rule/instance.c print/debug/perform/control.c print/debug/perform/pid.c
+build_sources_library print/error.c
+build_sources_library print/error/entry.c print/error/entry/action.c print/error/entry/item.c print/error/entry/setting.c
+build_sources_library print/error/perform/pid.c
+build_sources_library print/error/rule.c print/error/rule/action.c print/error/rule/instance.c print/error/rule/item.c print/error/rule/setting.c
+build_sources_library print/lock.c print/error/lock.c
+build_sources_library print/output/entry/setting.c print/output/rule/execute.c print/output/rule/setting.c print/output/rule/validate.c
+build_sources_library print/message.c print/message/entry.c print/message/entry/action.c print/message/entry/item.c
+build_sources_library print/warning/entry/action.c print/warning/entry/item.c print/warning/entry/setting.c print/warning/rule/action.c print/warning/rule/item.c print/warning/rule/setting.c
+build_sources_library signal.c status.c time.c
+build_sources_library thread.c thread/cleanup.c thread/control.c thread/enable.c thread/entry.c thread/instance.c thread/is.c thread/rule.c thread/signal.c
+build_sources_library validate.c
+
 build_sources_documentation man
 
 build_static no

diff --git a/data/build/settings.controller b/data/build/settings.controller
index e6f999c16435db3356c46206721743c0ab5ecdfa..c6aecef7a2f95a1b68b6bb455625a6793371b88d 100644 (file)
--- a/data/build/settings.controller
+++ b/data/build/settings.controller
@@ -53,10 +53,12 @@ build_libraries_static-individual_thread -l:libf_thread.a
 build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a -l:libcap.a
 build_libraries_static-monolithic -l:libfll.a -l:libcap.a
 
-build_sources_program config.c main.c controller.c string.c
-
 build_sources_headers controller.h string.h
 
+build_sources_program controller.c string.c
+
+build_sources_program config.c main.c
+
 build_sources_documentation man
 
 build_sources_setting controller

diff --git a/data/build/settings.init b/data/build/settings.init
index aa39abeb1912dd9dc9c8e182b082db562a2faf43..471df11f50fe3161fda852fde051d3f4a78cfd00 100644 (file)
--- a/data/build/settings.init
+++ b/data/build/settings.init
@@ -53,10 +53,12 @@ build_libraries_static-individual_thread -l:libf_thread.a
 build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a -l:libcap.a
 build_libraries_static-monolithic -l:libfll.a -l:libcap.a
 
-build_sources_program config.c main.c init.c print.c signal.c string.c
-
 build_sources_headers init.h print.h signal.h string.h
 
+build_sources_program init.c print.c signal.c string.c
+
+build_sources_program config.c main.c
+
 build_sources_documentation man
 
 build_sources_setting init

diff --git a/data/build/stand_alone/settings.controller b/data/build/stand_alone/settings.controller
index cd3a7e78518d2588c83dacfc4984ed9446865c67..0fb315bba20cd48a624d457e0556b94e4f6a8987 100644 (file)
--- a/data/build/stand_alone/settings.controller
+++ b/data/build/stand_alone/settings.controller
@@ -121,7 +121,11 @@ build_sources_program program/controller/main/signal.c program/controller/main/s
 build_sources_program program/controller/main/thread.c program/controller/main/thread/cleanup.c program/controller/main/thread/control.c program/controller/main/thread/enable.c program/controller/main/thread/entry.c program/controller/main/thread/instance.c program/controller/main/thread/is.c program/controller/main/thread/rule.c program/controller/main/thread/signal.c
 build_sources_program program/controller/main/validate.c
 
-build_sources_program program/controller/controller/config.c program/controller/controller/main.c program/controller/controller/controller.c program/controller/controller/string.c
+build_sources_headers program/controller/controller/controller.h program/controller/controller/string.h
+
+build_sources_program program/controller/controller/controller.c program/controller/controller/string.c
+
+build_sources_program program/controller/controller/config.c program/controller/controller/main.c
 
 build_sources_documentation man
 

diff --git a/data/build/stand_alone/settings.init b/data/build/stand_alone/settings.init
index 56bafb29b9bc4f51ea230960eac382088ad60c03..73091be9e693b938b7f3dc381b4bfb93b08d1bad 100644 (file)
--- a/data/build/stand_alone/settings.init
+++ b/data/build/stand_alone/settings.init
@@ -121,7 +121,11 @@ build_sources_program program/controller/main/signal.c program/controller/main/s
 build_sources_program program/controller/main/thread.c program/controller/main/thread/cleanup.c program/controller/main/thread/control.c program/controller/main/thread/enable.c program/controller/main/thread/entry.c program/controller/main/thread/instance.c program/controller/main/thread/is.c program/controller/main/thread/rule.c program/controller/main/thread/signal.c
 build_sources_program program/controller/main/validate.c
 
-build_sources_program program/controller/init/config.c program/controller/init/main.c program/controller/init/init.c program/controller/init/print.c program/controller/init/signal.c program/controller/init/string.c
+build_sources_headers program/controller/init/init.h program/controller/init/print.h program/controller/init/signal.h program/controller/init/string.h
+
+build_sources_program program/controller/init/init.c program/controller/init/print.c program/controller/init/signal.c program/controller/init/string.c
+
+build_sources_program program/controller/init/config.c program/controller/init/main.c
 
 build_sources_documentation man
 

diff --git a/sources/c/program/controller/main/config.c b/sources/c/program/controller/main/config.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sources/c/program/controller/main/config.h b/sources/c/program/controller/main/config.h
new file mode 100644 (file)
index 0000000..e69de29