Updates.. better file names

1 files changed, 29 insertions, 17 deletions

diff --git a/c_implementation/Makefile.am b/c_implementation/Makefile.am
index 57fd80a..9b6cd65 100644
--- a/c_implementation/Makefile.am
+++ b/c_implementation/Makefile.am
@@ -3,45 +3,57 @@ AM_CPPFLAGS = -Wall -Werror -Wextra -Wpedantic -ggdb -I$(top_srcdir)/include
 #AM_CFLAGS = -Wall -Werror -Wextra -Wpedantic -ggdb -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libaklog.la libaksettings.la libakfs.la libakdatetime.la libakutils.la
-libaklog_la_SOURCES = $(top_srcdir)/src/aklog.c
 
-libaksettings_la_SOURCES = $(top_srcdir)/src/aksettings.c
+libaklog_la_SOURCES = $(top_srcdir)/src/ak_log.c $(top_srcdir)/src/ak_log_main.c
 
-libakfs_LDADD = libaksettings.la
-libakfs_la_SOURCES = $(top_srcdir)/src/akfs.c $(top_srcdir)/src/aksettings.c $(top_srcdir)/src/akfs_sha512sum.c $(top_srcdir)/src/akfs_map_v3.c $(top_srcdir)/src/akfs_map_v4.c $(top_srcdir)/src/akfs_main.c
+libaksettings_la_SOURCES = $(top_srcdir)/src/ak_settings.c
 
-libakutils_la_SOURCES = $(top_srcdir)/src/akutils.c
+libakfs_LDADD = libaksettings.la libaklog.la
+libakfs_la_SOURCES = $(top_srcdir)/src/ak_fs.c \
+					 $(top_srcdir)/src/ak_fs_main.c \
+					 $(top_srcdir)/src/ak_fs_maps_v3.c \
+					 $(top_srcdir)/src/ak_fs_map_v3.c \
+					 $(top_srcdir)/src/ak_fs_map_v4.c \
+					 $(top_srcdir)/src/ak_fs_sha512sum.c
 
-libakdatetime_la_SOURCES = $(top_srcdir)/src/akdatetime.c
+libakutils_la_SOURCES = $(top_srcdir)/src/ak_utils.c
 
-include_HEADERS = include/libaklog.h include/libaksettings.h include/libakfs.h
+libakdatetime_la_SOURCES = $(top_srcdir)/src/ak_datetime.c
 
-bin_PROGRAMS = akt akdefuse aklog akfs
+#include_HEADERS = "$(wildcard include/*.h)"
+include_HEADERS = $(top_srcdir)/include/libaklog.h \
+				  $(top_srcdir)/include/libaksettings.h \
+				  $(top_srcdir)/include/libakfs.h \
+				  $(top_srcdir)/include/libak.h
+
+bin_PROGRAMS = akfs akdefuse #akt akdefuse aklog
 akfs_LDADD = libaklog.la libakfs.la libaksettings.la
-akfs_SOURCES = src/akfs_main.c
-akt_SOURCES = src/ak.c
+akfs_SOURCES = src/ak_fs_main.c
+
 akt_LDADD = libaklog.la libakfs.la libaksettings.la
 akt_SOURCES = src/ak.c
+
 akdefuse_CFLAGS = -I/usr/include/fuse3 -lfuse3 -lpthread
 akdefuse_LDADD = libaklog.la libakfs.la
-akdefuse_SOURCES = src/akfs_defuse.c
+akdefuse_SOURCES = src/ak_fs_defuse.c
+
 aklog_LDADD = libaklog.la
-aklog_SOURCES = src/aklog_main.c
+aklog_SOURCES = src/ak_log_main.c
 
 check_PROGRAMS = test_aklog test_aksettings test_akfs test_akutils test_akdatetime
-test_akdatetime_SOURCES = ./tests/test_akdatetime.c ./src/akdatetime.c
+test_akdatetime_SOURCES = ./tests/test_akdatetime.c ./src/ak_datetime.c
 test_akdatetime_LDADD = libakdatetime.la
 
-test_akutils_SOURCES = ./tests/test_akutils.c ./src/akutils.c
+test_akutils_SOURCES = ./tests/test_akutils.c ./src/ak_utils.c
 test_akutils_LDADD = libakutils.la
 
-test_aklog_SOURCES = ./tests/test_aklog.c ./src/aklog.c
+test_aklog_SOURCES = ./tests/test_aklog.c ./src/ak_log.c
 test_aklog_LDADD = libaklog.la
 
-test_akfs_SOURCES = ./tests/test_akfs.c ./src/akfs.c
+test_akfs_SOURCES = ./tests/test_akfs.c ./src/ak_fs.c
 test_akfs_LDADD = libakfs.la libaklog.la
 
-test_aksettings_SOURCES = ./tests/test_aksettings.c ./src/aksettings.c ./src/aklog.c
+test_aksettings_SOURCES = ./tests/test_aksettings.c ./src/ak_settings.c ./src/ak_log.c
 test_aksettings_LDADD = libaksettings.la
 
 tests_test_main_CPPFLAGS = -I$(top_srcdir)/include