[C] Necessary refactoring

6 files changed, 19 insertions, 14 deletions

diff --git a/c_implementation/build_tree/ak_fs_build.sh b/c_implementation/build_tree/ak_fs_build.sh
index a18b824..11b4fde 100755
--- a/c_implementation/build_tree/ak_fs_build.sh
+++ b/c_implementation/build_tree/ak_fs_build.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
 echo "Building lib/akfs.so" && \
-gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include akfs.c -o lib/akfs.so && \
+gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include ./src/akfs.c -o lib/libakfs.so && \
 echo "Building tests/test_akfs" && \
-gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_akfs.c lib/akfs.so -o tests/test_akfs && \
+gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_akfs.c lib/libakfs.so -o tests/test_akfs && \
 echo "Running test_akfs" && \
 time ./tests/test_akfs && \
 rm ./tests/test_akfs
 
 echo "Building tests/test_akfs_mkdir.c" && \
-gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_akfs_mkdir.c lib/akfs.so -o tests/test_akfs_mkdir && \
+gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_akfs_mkdir.c lib/libakfs.so -o tests/test_akfs_mkdir && \
 echo "Running test_akfs_mkdir" && \
 time ./tests/test_akfs_mkdir && \
 rm ./tests/test_akfs_mkdir
diff --git a/c_implementation/build_tree/ak_log_build.sh b/c_implementation/build_tree/ak_log_build.sh
index 713b915..76a4113 100755
--- a/c_implementation/build_tree/ak_log_build.sh
+++ b/c_implementation/build_tree/ak_log_build.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 echo "Building lib/aklog.so" && \
-gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include aklog.c -o lib/aklog.so && \
+gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include src/aklog.c -o lib/libaklog.so && \
 echo "Building tests/test_aklog" && \
-gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aklog.c lib/aklog.so -o tests/test_aklog && \
+gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aklog.c lib/libaklog.so -o tests/test_aklog && \
 echo "Running test_aklog" && \
 time ./tests/test_aklog # && \
 # rm ./tests/test_aklog
-gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aklogwrite.c lib/aklog.so -o tests/test_aklogwrite && \
+gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aklogwrite.c lib/libaklog.so -o tests/test_aklogwrite && \
 echo "Running test_aklogwrite" && \
 time ./tests/test_aklogwrite && \
 rm ./tests/test_aklogwrite
diff --git a/c_implementation/build_tree/ak_logcatter_build.sh b/c_implementation/build_tree/ak_logcatter_build.sh
index 5038073..aa321cb 100755
--- a/c_implementation/build_tree/ak_logcatter_build.sh
+++ b/c_implementation/build_tree/ak_logcatter_build.sh
@@ -1,7 +1,7 @@
 echo "Building lib/aklogcatter.so" && \
-gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include aklogcatter.c -o lib/aklogcatter.so && \
+gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include src/aklogcatter.c -o lib/libaklogcatter.so && \
 echo "Building tests/test_aklogcatter" && \
-gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aklogcatter.c lib/aklog.so lib/aklogcatter.so -o tests/test_aklogcatter && \
+gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aklogcatter.c lib/libaklog.so lib/libaklogcatter.so -o tests/test_aklogcatter && \
 echo "Running test_aklogcatter" && \
 time ./tests/test_aklogcatter && \
 rm ./tests/test_aklogcatter
diff --git a/c_implementation/build_tree/ak_settings_build.sh b/c_implementation/build_tree/ak_settings_build.sh
index 09009a8..f5137f9 100755
--- a/c_implementation/build_tree/ak_settings_build.sh
+++ b/c_implementation/build_tree/ak_settings_build.sh
@@ -1,11 +1,11 @@
 echo "Building lib/aksettings.so" && \
-gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include aksettings.c -o lib/aksettings.so && \
+gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include src/aksettings.c -o lib/libaksettings.so && \
 echo "Building tests/test_aksettings" && \
-gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aksettings.c lib/aklog.so lib/aksettings.so -o tests/test_aksettings && \
+gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aksettings.c lib/libaklog.so lib/libaksettings.so -o tests/test_aksettings && \
 echo "Running test_aksettings" && \
 time ./tests/test_aksettings && \
 rm ./tests/test_aksettings
-gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aksettings_read.c lib/aklog.so lib/aksettings.so -o tests/test_aksettings_read && \
+gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_aksettings_read.c lib/libaklog.so lib/libaksettings.so -o tests/test_aksettings_read && \
 echo "Running test_aksettings_read" && \
 time ./tests/test_aksettings_read && \
 rm ./tests/test_aksettings_read
diff --git a/c_implementation/build_tree/ak_utils_build.sh b/c_implementation/build_tree/ak_utils_build.sh
index 4300307..178519a 100755
--- a/c_implementation/build_tree/ak_utils_build.sh
+++ b/c_implementation/build_tree/ak_utils_build.sh
@@ -1,2 +1,7 @@
-echo "Building lib/akutils.so" && gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include akutils.c -o lib/akutils.so && echo "Building tests/test_akutils" && gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_akutils.c lib/akutils.so -o tests/test_akutils && echo "Running test_akutils" && time ./tests/test_akutils
-rm ./tests/test_akutils
+echo "Building lib/akutils.so" && \
+    gcc -c -shared -Wextra -Wall -Werror -pedantic -ggdb -fPIC -I./include src/akutils.c -o lib/libakutils.so && \
+    echo "Building tests/test_akutils" && \
+    gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include tests/test_akutils.c lib/libakutils.so -o tests/test_akutils && \
+    echo "Running test_akutils" && \
+    time ./tests/test_akutils && \
+    rm ./tests/test_akutils
diff --git a/c_implementation/build_tree/libsodium_test_build.sh b/c_implementation/build_tree/libsodium_test_build.sh
index 0897835..f427873 100755
--- a/c_implementation/build_tree/libsodium_test_build.sh
+++ b/c_implementation/build_tree/libsodium_test_build.sh
@@ -1 +1 @@
-gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include -lsodium tests/libsodium.c lib/aklog.so -o watah
+gcc -Wextra -Wall -Werror -pedantic -ggdb -Wl,-rpath=lib -I./include -lsodium tests/libsodium.c lib/libaklog.so -o watah