Update: Firewall directory path structure to match other projects external to FLL.

The `config.c` and `config.h` should also not be included by default.

diff --git a/data/build/settings b/data/build/settings
index dcb8b6aca85aa29eee7c5b2045fa5bddfb263d04..05ada8146c5a669c5c629c2adf4691bfaf93a3e8 100644 (file)
--- a/data/build/settings
+++ b/data/build/settings
@@ -46,17 +46,17 @@ 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
 build_libraries_static-monolithic -l:libfll.a
 
-build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c
-build_sources_library main/print/debug.c main/print/error.c main/print/message.c main/print/warning.c
-build_sources_library main/operate.c main/operate/buffer.c main/operate/chains.c main/operate/create.c main/operate/default.c main/operate/delete.c main/operate/process.c main/operate/rules.c main/operate/show.c
-build_sources_library main/firewall.c main/signal.c main/thread.c
+build_sources_library common.c common/define.c common/enumeration.c common/string.c common/type.c
+build_sources_library print/debug.c print/error.c print/message.c print/warning.c
+build_sources_library operate.c operate/buffer.c operate/chains.c operate/create.c operate/default.c operate/delete.c operate/process.c operate/rules.c operate/show.c
+build_sources_library firewall.c signal.c thread.c
 
-build_sources_program config.c main/main.c
+build_sources_program main.c
 
-build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h
-build_sources_headers main/print/debug.h main/print/error.h main/print/message.h main/print/warning.h
-build_sources_headers main/operate.h main/operate/buffer.h main/operate/chains.h main/operate/create.h main/operate/default.h main/operate/delete.h main/operate/process.h main/operate/rules.h main/operate/show.h
-build_sources_headers main/firewall.h main/operate.h main/signal.h main/thread.h
+build_sources_headers common.h common/define.h common/enumeration.h common/string.h common/type.h
+build_sources_headers print/debug.h print/error.h print/message.h print/warning.h
+build_sources_headers operate.h operate/buffer.h operate/chains.h operate/create.h operate/default.h operate/delete.h operate/process.h operate/rules.h operate/show.h
+build_sources_headers firewall.h operate.h signal.h thread.h
 
 build_sources_documentation man
 
@@ -66,7 +66,7 @@ build_script yes
 build_shared yes
 build_static no
 
-path_headers program/firewall
+path_headers program/firewall/main
 path_library_script script
 path_library_shared shared
 path_library_static static
@@ -76,8 +76,9 @@ path_object_static static
 path_program_script script
 path_program_shared shared
 path_program_static static
+path_sources sources/c/program/firewall/main
 
-has_path_standard yes
+has_path_standard no
 preserve_path_headers yes
 
 search_exclusive yes

diff --git a/sources/c/config.c b/sources/c/config.c
deleted file mode 100644 (file)
index 1ac2545..0000000
--- a/sources/c/config.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "config.h"

diff --git a/sources/c/config.h b/sources/c/config.h
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/sources/c/config.h
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/sources/c/main/common.c b/sources/c/program/firewall/main/common.c
similarity index 100%
rename from sources/c/main/common.c
rename to sources/c/program/firewall/main/common.c

diff --git a/sources/c/main/common.h b/sources/c/program/firewall/main/common.h
similarity index 100%
rename from sources/c/main/common.h
rename to sources/c/program/firewall/main/common.h

diff --git a/sources/c/main/common/define.c b/sources/c/program/firewall/main/common/define.c
similarity index 100%
rename from sources/c/main/common/define.c
rename to sources/c/program/firewall/main/common/define.c

diff --git a/sources/c/main/common/define.h b/sources/c/program/firewall/main/common/define.h
similarity index 100%
rename from sources/c/main/common/define.h
rename to sources/c/program/firewall/main/common/define.h

diff --git a/sources/c/main/common/enumeration.c b/sources/c/program/firewall/main/common/enumeration.c
similarity index 100%
rename from sources/c/main/common/enumeration.c
rename to sources/c/program/firewall/main/common/enumeration.c

diff --git a/sources/c/main/common/enumeration.h b/sources/c/program/firewall/main/common/enumeration.h
similarity index 100%
rename from sources/c/main/common/enumeration.h
rename to sources/c/program/firewall/main/common/enumeration.h

diff --git a/sources/c/main/common/string.c b/sources/c/program/firewall/main/common/string.c
similarity index 100%
rename from sources/c/main/common/string.c
rename to sources/c/program/firewall/main/common/string.c

diff --git a/sources/c/main/common/string.h b/sources/c/program/firewall/main/common/string.h
similarity index 100%
rename from sources/c/main/common/string.h
rename to sources/c/program/firewall/main/common/string.h

diff --git a/sources/c/main/common/type.c b/sources/c/program/firewall/main/common/type.c
similarity index 100%
rename from sources/c/main/common/type.c
rename to sources/c/program/firewall/main/common/type.c

diff --git a/sources/c/main/common/type.h b/sources/c/program/firewall/main/common/type.h
similarity index 100%
rename from sources/c/main/common/type.h
rename to sources/c/program/firewall/main/common/type.h

diff --git a/sources/c/main/firewall.c b/sources/c/program/firewall/main/firewall.c
similarity index 100%
rename from sources/c/main/firewall.c
rename to sources/c/program/firewall/main/firewall.c

diff --git a/sources/c/main/firewall.h b/sources/c/program/firewall/main/firewall.h
similarity index 100%
rename from sources/c/main/firewall.h
rename to sources/c/program/firewall/main/firewall.h

diff --git a/sources/c/main/main.c b/sources/c/program/firewall/main/main.c
similarity index 100%
rename from sources/c/main/main.c
rename to sources/c/program/firewall/main/main.c

diff --git a/sources/c/main/main.h b/sources/c/program/firewall/main/main.h
similarity index 100%
rename from sources/c/main/main.h
rename to sources/c/program/firewall/main/main.h

diff --git a/sources/c/main/operate.c b/sources/c/program/firewall/main/operate.c
similarity index 100%
rename from sources/c/main/operate.c
rename to sources/c/program/firewall/main/operate.c

diff --git a/sources/c/main/operate.h b/sources/c/program/firewall/main/operate.h
similarity index 100%
rename from sources/c/main/operate.h
rename to sources/c/program/firewall/main/operate.h

diff --git a/sources/c/main/operate/buffer.c b/sources/c/program/firewall/main/operate/buffer.c
similarity index 100%
rename from sources/c/main/operate/buffer.c
rename to sources/c/program/firewall/main/operate/buffer.c

diff --git a/sources/c/main/operate/buffer.h b/sources/c/program/firewall/main/operate/buffer.h
similarity index 100%
rename from sources/c/main/operate/buffer.h
rename to sources/c/program/firewall/main/operate/buffer.h

diff --git a/sources/c/main/operate/chains.c b/sources/c/program/firewall/main/operate/chains.c
similarity index 100%
rename from sources/c/main/operate/chains.c
rename to sources/c/program/firewall/main/operate/chains.c

diff --git a/sources/c/main/operate/chains.h b/sources/c/program/firewall/main/operate/chains.h
similarity index 100%
rename from sources/c/main/operate/chains.h
rename to sources/c/program/firewall/main/operate/chains.h

diff --git a/sources/c/main/operate/create.c b/sources/c/program/firewall/main/operate/create.c
similarity index 100%
rename from sources/c/main/operate/create.c
rename to sources/c/program/firewall/main/operate/create.c

diff --git a/sources/c/main/operate/create.h b/sources/c/program/firewall/main/operate/create.h
similarity index 100%
rename from sources/c/main/operate/create.h
rename to sources/c/program/firewall/main/operate/create.h

diff --git a/sources/c/main/operate/default.c b/sources/c/program/firewall/main/operate/default.c
similarity index 100%
rename from sources/c/main/operate/default.c
rename to sources/c/program/firewall/main/operate/default.c

diff --git a/sources/c/main/operate/default.h b/sources/c/program/firewall/main/operate/default.h
similarity index 100%
rename from sources/c/main/operate/default.h
rename to sources/c/program/firewall/main/operate/default.h

diff --git a/sources/c/main/operate/delete.c b/sources/c/program/firewall/main/operate/delete.c
similarity index 100%
rename from sources/c/main/operate/delete.c
rename to sources/c/program/firewall/main/operate/delete.c

diff --git a/sources/c/main/operate/delete.h b/sources/c/program/firewall/main/operate/delete.h
similarity index 100%
rename from sources/c/main/operate/delete.h
rename to sources/c/program/firewall/main/operate/delete.h

diff --git a/sources/c/main/operate/process.c b/sources/c/program/firewall/main/operate/process.c
similarity index 100%
rename from sources/c/main/operate/process.c
rename to sources/c/program/firewall/main/operate/process.c

diff --git a/sources/c/main/operate/process.h b/sources/c/program/firewall/main/operate/process.h
similarity index 100%
rename from sources/c/main/operate/process.h
rename to sources/c/program/firewall/main/operate/process.h

diff --git a/sources/c/main/operate/rules.c b/sources/c/program/firewall/main/operate/rules.c
similarity index 100%
rename from sources/c/main/operate/rules.c
rename to sources/c/program/firewall/main/operate/rules.c

diff --git a/sources/c/main/operate/rules.h b/sources/c/program/firewall/main/operate/rules.h
similarity index 100%
rename from sources/c/main/operate/rules.h
rename to sources/c/program/firewall/main/operate/rules.h

diff --git a/sources/c/main/operate/show.c b/sources/c/program/firewall/main/operate/show.c
similarity index 100%
rename from sources/c/main/operate/show.c
rename to sources/c/program/firewall/main/operate/show.c

diff --git a/sources/c/main/operate/show.h b/sources/c/program/firewall/main/operate/show.h
similarity index 100%
rename from sources/c/main/operate/show.h
rename to sources/c/program/firewall/main/operate/show.h

diff --git a/sources/c/main/print/debug.c b/sources/c/program/firewall/main/print/debug.c
similarity index 100%
rename from sources/c/main/print/debug.c
rename to sources/c/program/firewall/main/print/debug.c

diff --git a/sources/c/main/print/debug.h b/sources/c/program/firewall/main/print/debug.h
similarity index 100%
rename from sources/c/main/print/debug.h
rename to sources/c/program/firewall/main/print/debug.h

diff --git a/sources/c/main/print/error.c b/sources/c/program/firewall/main/print/error.c
similarity index 100%
rename from sources/c/main/print/error.c
rename to sources/c/program/firewall/main/print/error.c

diff --git a/sources/c/main/print/error.h b/sources/c/program/firewall/main/print/error.h
similarity index 100%
rename from sources/c/main/print/error.h
rename to sources/c/program/firewall/main/print/error.h

diff --git a/sources/c/main/print/message.c b/sources/c/program/firewall/main/print/message.c
similarity index 100%
rename from sources/c/main/print/message.c
rename to sources/c/program/firewall/main/print/message.c

diff --git a/sources/c/main/print/message.h b/sources/c/program/firewall/main/print/message.h
similarity index 100%
rename from sources/c/main/print/message.h
rename to sources/c/program/firewall/main/print/message.h

diff --git a/sources/c/main/print/warning.c b/sources/c/program/firewall/main/print/warning.c
similarity index 100%
rename from sources/c/main/print/warning.c
rename to sources/c/program/firewall/main/print/warning.c

diff --git a/sources/c/main/print/warning.h b/sources/c/program/firewall/main/print/warning.h
similarity index 100%
rename from sources/c/main/print/warning.h
rename to sources/c/program/firewall/main/print/warning.h

diff --git a/sources/c/main/signal.c b/sources/c/program/firewall/main/signal.c
similarity index 100%
rename from sources/c/main/signal.c
rename to sources/c/program/firewall/main/signal.c

diff --git a/sources/c/main/signal.h b/sources/c/program/firewall/main/signal.h
similarity index 100%
rename from sources/c/main/signal.h
rename to sources/c/program/firewall/main/signal.h

diff --git a/sources/c/main/thread.c b/sources/c/program/firewall/main/thread.c
similarity index 100%
rename from sources/c/main/thread.c
rename to sources/c/program/firewall/main/thread.c

diff --git a/sources/c/main/thread.h b/sources/c/program/firewall/main/thread.h
similarity index 100%
rename from sources/c/main/thread.h
rename to sources/c/program/firewall/main/thread.h